 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 |
|
|
Ghommie
|
bd9fa27ca1
|
Now it's tested.
|
2019-07-08 16:24:26 +02:00 |
|
|
Ghommie
|
9d35584e58
|
fixes uninteractable toolboxes.
|
2019-07-08 15:34:19 +02:00 |
|
|
Ghommie
|
9043402483
|
Rubber toolboxes.
|
2019-07-08 14:34:14 +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 |
|
|
Thalpy
|
cc39c9f896
|
Merge branch 'master' into master
|
2019-07-06 16:03:17 +01:00 |
|
|
Ghommie
|
00879a6e28
|
Holographic PDA Quickfix!
|
2019-07-06 03:46:01 +02:00 |
|
|
BurgerLua
|
f4307f919b
|
Nerfed changeling transformation string by making it temporary.
|
2019-07-05 16:49:02 -07:00 |
|
|
Ghommie
|
3ca31617aa
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114
|
2019-07-05 23:06:57 +02:00 |
|
|
Ghommie
|
03315d1cbb
|
Ports a toggleable darkmode to the game!
|
2019-07-05 22:29:50 +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 |
|
|
Thalpy
|
8a6e669060
|
Merge branch 'master' into master
|
2019-07-04 03:14:29 +01: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
|
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
|
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
|
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 |
|
|
TrilbySpaceClone
|
688fabfffc
|
Honk
|
2019-06-29 21:03:38 -04:00 |
|
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
|
Sishen
|
97241cd1e8
|
jetpacks, take 2
|
2019-06-29 00:29:49 -04: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
|
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 |
|
|
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 |
|
|
Ghommie
|
180ab72b78
|
more changes.
|
2019-06-28 03:45:42 +02:00 |
|
|
Ghommie
|
8d9832938f
|
New sprites for the curator, lawyer and roboticist pda cartridges.
|
2019-06-28 03:31:46 +02:00 |
|
|
Trilbyspaceclone
|
6ad0a0ba0d
|
Update belt.dm
|
2019-06-26 20:14:05 -04:00 |
|
|
Trilbyspaceclone
|
6b173432b2
|
Update belt.dm
|
2019-06-26 20:09:37 -04:00 |
|
|
Trilbyspaceclone
|
7830b27b07
|
Update backpack.dm
|
2019-06-26 19:27:22 -04:00 |
|
|
Trilbyspaceclone
|
707da687e7
|
madness
|
2019-06-26 18:54:02 -04:00 |
|
|
Trilbyspaceclone
|
69ac1dfb6d
|
icons
|
2019-06-26 18:52:34 -04:00 |
|
|
Trilbyspaceclone
|
b1617999fb
|
Update shields.dm
|
2019-06-26 18:22:59 -04:00 |
|
|
Sishen
|
935080e7a1
|
thatwasreallyannoying
|
2019-06-24 20:21:27 -04:00 |
|