 Ghommie
|
3440757fd0
|
Glass.
|
2019-07-21 10:01:00 +02:00 |
|
|
ThalpyandGitHub
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
|
BurgerLua
|
60beff3420
|
Added
|
2019-07-20 17:42:00 -07:00 |
|
|
Ghommie
|
7065a86841
|
Revert "Revert "Fixes rocket launchers, buffing their accuracy etc.""
|
2019-07-19 22:02:22 +02:00 |
|
|
Ghommie
|
b87442e633
|
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
|
2019-07-19 20:09:16 +02:00 |
|
|
Ghommie
|
589cdae0e1
|
Towels
|
2019-07-18 00:03:49 +02:00 |
|
|
Ghommie
|
ee32e1680f
|
Ports "Replaces radio channel names and keys with defines"
|
2019-07-17 00:52:41 +02:00 |
|
|
ThalpyandGitHub
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
|
Ghommie
|
fac3e65c68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-07-15 17:42:47 +02:00 |
|
|
Ghommie
|
1e1f8e627f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-15 17:33:41 +02:00 |
|
|
Ghommie
|
4df4cbd721
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-15 17:23:01 +02:00 |
|
|
kevinz000andGitHub
|
2ec5d3f02e
|
Merge pull request #8886 from Ghommie/Ghommie-cit137
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-14 14:05:20 -07:00 |
|
|
ThalpyandGitHub
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
|
kevinz000andGitHub
|
735fc5fab6
|
Merge pull request #8845 from Ghommie/Ghommie-cit121
Tweaking the 🅱️ emoji icon.
|
2019-07-14 03:35:33 -07:00 |
|
|
ThalpyandGitHub
|
4c4dbd0e17
|
Merge branch 'master' into master
|
2019-07-13 19:33:46 +01:00 |
|
|
Ghommie
|
129ca9d71f
|
Ports "Refactors NODROP flag into TRAIT_NODROP"
|
2019-07-13 10:27:39 +02:00 |
|
|
kevinz000andGitHub
|
1eaddd3ebf
|
Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-12 07:34:19 -07:00 |
|
|
kevinz000andGitHub
|
b5cb68fc68
|
Merge pull request #8844 from Ghommie/Ghommie-cit120
Fixes rocket launchers, buffing their accuracy etc.
|
2019-07-09 08:30:44 -07:00 |
|
|
Ghommie
|
490ae9daf2
|
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-09 07:58:22 +02:00 |
|
|
ThalpyandGitHub
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
|
Ghommie
|
9081b5b773
|
Revert "Fixes rocket launchers, buffing their accuracy etc."
This reverts commit 1c6156dd0e.
|
2019-07-08 07:17:49 +02:00 |
|
|
Ghommie
|
1c6156dd0e
|
Fixes rocket launchers, buffing their accuracy etc.
|
2019-07-08 06:56:20 +02:00 |
|
|
kevinz000andGitHub
|
d0a74ef331
|
Revert "Adds a can_inject check to IV Drips"
|
2019-07-07 02:29:49 -07:00 |
|
|
ThalpyandGitHub
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01:00 |
|
|
Ghommie
|
a3ab5f6d23
|
Moving the snowflake mob var to the component and finalizing.
|
2019-07-04 02:03:51 +02:00 |
|
|
kevinz000andGitHub
|
e62213a6cd
|
Merge pull request #8775 from Ghommie/Ghommie-cit95
crew monitor indexing pet peeve.
|
2019-07-03 13:45:34 -07:00 |
|
|
Ghommie
|
ffecca8c11
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-03 03:24:28 +02:00 |
|
|
Ghommie
|
c58efa64c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-03 02:36:23 +02:00 |
|
|
ThalpyandGitHub
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
|
kevinz000andGitHub
|
7e1522b76b
|
Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
|
2019-06-28 20:30:05 -07:00 |
|
|
Ghommie
|
f210e79f3f
|
Slight tweaks to the crew monitor indexing.
|
2019-06-28 19:47:19 +02:00 |
|
|
kevinz000andGitHub
|
f7bbca8918
|
Merge pull request #8731 from Ghommie/Ghommie-cit81
Ports in microwave updates and its radial menu.
|
2019-06-28 05:19:04 -07:00 |
|
|
deathride58andGitHub
|
fb66d382fa
|
Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
|
2019-06-28 00:47:09 -04:00 |
|
|
Ghommie
|
61a6d899d2
|
Should be ready.
|
2019-06-26 00:21:06 +02:00 |
|
|
Ghommie
|
67f00fc049
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42
|
2019-06-24 16:48:15 +02:00 |
|
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
|
kevinz000andGitHub
|
294e1e48d2
|
Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
|
2019-06-23 06:50:32 -07:00 |
|
|
kevinz000andGitHub
|
fc9a5415d8
|
Merge pull request #8678 from Sishen1542/SECMANBAD
Fixes Plush Doll Loot [FOR REAL THIS TIME]
|
2019-06-23 06:48:53 -07:00 |
|
|
Trilbyspacecloneandkevinz000
|
d85a2f5f4a
|
Update arcade.dm (#8675)
|
2019-06-23 05:59:35 -07:00 |
|
|
Ghommie
|
2e30b91567
|
Ports in microwave updates and its radial menu.
|
2019-06-23 06:10:49 +02:00 |
|
|
Ghommie
|
138535f9f6
|
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines.
|
2019-06-22 23:15:51 +02:00 |
|
|
Sishen
|
95a6b5d7a9
|
Update arcade.dm
|
2019-06-17 14:35:24 -04:00 |
|
|
Sishen
|
96f0f0bd24
|
Update arcade.dm
|
2019-06-17 14:31:24 -04:00 |
|
|
ThalpyandGitHub
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
|
Ghommie
|
d5279c8373
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-17 09:51:22 +02:00 |
|
|
kevinz000andGitHub
|
1a6450a2e2
|
Merge pull request #8416 from Trilbyspaceclone/patch-135
Gives sec EVA suits storge some Sec Jetpacks
|
2019-06-16 19:35:05 -07:00 |
|
|
Ghommie
|
b2d82bd1f1
|
Applying upstream fixes.
|
2019-06-17 00:27:07 +02:00 |
|
|
kevinz000andGitHub
|
9c0cc52771
|
Merge pull request #8600 from Sishen1542/plushsalt
Makes plushies not a 2% prize from the arcades
|
2019-06-16 01:11:37 -07:00 |
|
|
BlackMajorandGitHub
|
0294cba855
|
Merge pull request #8213 from Citadel-Station-13/kevinz000-patch-33
shuttle purchase announcements are no longer delayed by mapload's blocking proccall
|
2019-06-16 20:09:15 +12:00 |
|
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|