Poojawa
|
c4f736eb94
|
Merge branch 'master' into job-menu-improvements
|
2019-07-10 18:55:29 -05:00 |
|
kevinz000
|
b5cb68fc68
|
Merge pull request #8844 from Ghommie/Ghommie-cit120
Fixes rocket launchers, buffing their accuracy etc.
|
2019-07-09 08:30:44 -07:00 |
|
deathride58
|
b8229b365c
|
Merge pull request #8655 from Citadel-Station-13/kevinz000-patch-2
Fixes RLD icon
|
2019-07-08 18:12:02 -04:00 |
|
deathride58
|
b8e34d1cab
|
Merge pull request #8704 from Citadel-Station-13/kevinz000-patch-12
[s] RCD logging
|
2019-07-08 18:07:27 -04:00 |
|
deathride58
|
d218739bf8
|
Merge pull request #8740 from Ghommie/Ghommie-cit87
ports "More variety for dorms bedsheets" + 3 new bed sheets.
|
2019-07-08 18:06:11 -04:00 |
|
deathride58
|
e19c622b08
|
Merge pull request #8837 from Citadel-Station-13/revert-8244-iv-dripper-punctures
Revert "Adds a can_inject check to IV Drips"
|
2019-07-08 17:57:30 -04:00 |
|
deathride58
|
33ed7cf72c
|
Merge pull request #8822 from Ghommie/Ghommie-cit107
[s] ports "Fixes infinite brass generation exploit"
|
2019-07-08 17:43:59 -04:00 |
|
Ghommie
|
1c6156dd0e
|
Fixes rocket launchers, buffing their accuracy etc.
|
2019-07-08 06:56:20 +02:00 |
|
kevinz000
|
d61732472c
|
Merge pull request #8831 from Ghommie/Ghommie-cit115
Holographic PDA Quickfix!
|
2019-07-07 11:08:15 -07:00 |
|
kevinz000
|
1b4df74efb
|
Merge pull request #8802 from Ghommie/Ghommie-cit101
Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.
|
2019-07-07 02:39:07 -07:00 |
|
kevinz000
|
e227d5575c
|
Merge pull request #8825 from Ghommie/Ghommie-cit110
Ports "Fixes default supplypods exploding their contents" & co.
|
2019-07-07 02:34:47 -07:00 |
|
kevinz000
|
d0a74ef331
|
Revert "Adds a can_inject check to IV Drips"
|
2019-07-07 02:29:49 -07:00 |
|
Ghommie
|
00879a6e28
|
Holographic PDA Quickfix!
|
2019-07-06 03:46:01 +02:00 |
|
kevinz000
|
7544748570
|
Merge pull request #8790 from deathride58/pryablesleepers
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar
|
2019-07-05 06:55:18 -07:00 |
|
Ghommie
|
b41e289db3
|
Ports "Fixes default supplypods exploding their contents" & co.
|
2019-07-04 22:35:13 +02:00 |
|
Ghommie
|
98418c7f87
|
[s] ports "Fixes infinite brass generation exploit"
|
2019-07-04 21:54:20 +02:00 |
|
Poojawa
|
f66ee6f967
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-07-04 00:44:29 -05:00 |
|
kevinz000
|
ba74189192
|
Merge pull request #8768 from Ghommie/Ghommie-cit94
New sprites for the some pda cartridges.
|
2019-07-03 13:47:53 -07:00 |
|
kevinz000
|
ce2914ab90
|
Merge pull request #8769 from Arturlang/ALT_Mech_Strafing
Alt now tempoarily disables strafing for mechs.
|
2019-07-03 13:47:29 -07:00 |
|
kevinz000
|
bce4ce31ab
|
Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-07-03 13:47:04 -07:00 |
|
kevinz000
|
e62213a6cd
|
Merge pull request #8775 from Ghommie/Ghommie-cit95
crew monitor indexing pet peeve.
|
2019-07-03 13:45:34 -07:00 |
|
kevinz000
|
e08002ba4f
|
Merge remote-tracking branch 'origin/master' into kevinz000-patch-2
|
2019-07-03 09:49:23 -07:00 |
|
kevinz000
|
85534fa1ef
|
Merge pull request #8793 from Ghommie/Ghommie-cit99
Fixes PDA skin preference not saving up.
|
2019-07-03 05:19:13 -07:00 |
|
kevinz000
|
06f1eb6dcd
|
Merge pull request #8810 from Trilbyspaceclone/patch-185
Corrects Plastitanium total object damage
|
2019-07-03 05:18:21 -07:00 |
|
Ghommie
|
b2c5e002ec
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit94
|
2019-07-03 02:50:49 +02:00 |
|
Trilbyspaceclone
|
88c01dd521
|
I need to take a brake
|
2019-07-01 16:47:50 -04:00 |
|
Ghommie
|
8c1e6ff66a
|
Thanks for pointing that out, lolman.
|
2019-07-01 09:24:35 +02:00 |
|
Ghommie
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|
Ghommie
|
c569da5713
|
Fixes PDA skin preference not saving up.
|
2019-06-30 17:17:23 +02:00 |
|
deathride58
|
cb5ed2d2cd
|
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar
|
2019-06-30 04:29:48 -04:00 |
|
kevinz000
|
cef22b3c5a
|
Merge pull request #8786 from Sishen1542/jetpacc
Update jetpack.dm
|
2019-06-29 22:17:00 -07:00 |
|
Sishen
|
575f70f3b2
|
Update jetpack.dm
|
2019-06-30 01:13:37 -04:00 |
|
kevinz000
|
be377c4bda
|
Merge pull request #8779 from Sishen1542/jetpacc
Nerfs roundstart carbon jetpacks. TAKE TWO
|
2019-06-29 20:09:33 -07:00 |
|
Ghommie
|
ad3b709c40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
|
2019-06-29 06:39:21 +02:00 |
|
Sishen
|
97241cd1e8
|
jetpacks, take 2
|
2019-06-29 00:29:49 -04:00 |
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02:00 |
|
kevinz000
|
fbbfb02364
|
Merge pull request #8681 from Ghommie/Ghommie-cit64
Fixes vape and its sprites
|
2019-06-28 20:36:43 -07:00 |
|
kevinz000
|
a6caf4c63f
|
Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
|
2019-06-28 20:30:44 -07:00 |
|
kevinz000
|
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 |
|
Ghommie
|
513f0af0fa
|
turns out the curator cartridge already had an (unused) sprite.
|
2019-06-28 17:14:57 +02:00 |
|
kevinz000
|
6c77443887
|
Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
|
2019-06-28 05:28:35 -07:00 |
|
Sishen
|
555c1adf67
|
fix per kevs request
|
2019-06-28 08:20:59 -04:00 |
|
kevinz000
|
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 |
|
kevinz000
|
f76737dc04
|
Merge pull request #8708 from Trilbyspaceclone/patch-185
Corrects the "Durasteel" to be plastitanium tool boxes
|
2019-06-28 05:18:35 -07:00 |
|
kevinz000
|
ee852382f8
|
Merge pull request #8726 from Sishen1542/biblethump
Tweaks to chaplain bible heals. Time to pull out the old brainbuster.
|
2019-06-28 05:14:57 -07:00 |
|
Arturlang
|
2ecaa57a98
|
Description so people know it exists
|
2019-06-28 11:28:37 +03:00 |
|
Arturlang
|
a9d4f53728
|
Alt-Keys now let you strafe! Wow!
|
2019-06-28 11:27:35 +03:00 |
|
deathride58
|
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 |
|
deathride58
|
720d4ee4c8
|
Merge pull request #8745 from Sishen1542/CASfix
Port of tg pull #44158, the fix of Cards Against Space!
|
2019-06-28 00:25:32 -04:00 |
|