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 |
|
Trilbyspaceclone
|
88c01dd521
|
I need to take a brake
|
2019-07-01 16:47:50 -04:00 |
|
Ghommie
|
c569da5713
|
Fixes PDA skin preference not saving up.
|
2019-06-30 17:17:23 +02: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 |
|
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 |
|
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 |
|
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 |
|
Sishen
|
935080e7a1
|
thatwasreallyannoying
|
2019-06-24 20:21:27 -04: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 |
|
Ghommie
|
71298c084d
|
didn't init the list, bravo.
|
2019-06-24 03:09:43 +02:00 |
|
Trilbyspaceclone
|
ede0bbe89e
|
Merge branch 'master' into patch-185
|
2019-06-23 20:56:25 -04:00 |
|
kevinz000
|
05f304f9c0
|
Merge pull request #8692 from Ghommie/Ghommie-cit69
[s] Ports "Fixes PDA TK exploits" and "Fixes pride mirror exploit"
|
2019-06-23 06:56:17 -07:00 |
|
kevinz000
|
d30560f7d7
|
Merge pull request #8722 from Trilbyspaceclone/patch-186
Makes tower shield be see able
|
2019-06-23 06:52:25 -07:00 |
|
kevinz000
|
082d6c75a9
|
Merge pull request #8688 from Ghommie/Ghommie-cit67
Ports in bee plushes.
|
2019-06-23 06:45:49 -07:00 |
|
kevinz000
|
228df53c99
|
Merge pull request #8698 from Ghommie/Ghommie-cit72
Fixes "Penlights Cannot Give Eye Exams"
|
2019-06-23 06:41:03 -07:00 |
|
kevinz000
|
e7331b3c98
|
Merge pull request #8571 from Thalpy/Dwarf
Medical smartdarts.
|
2019-06-23 06:24:10 -07:00 |
|
Ghom
|
41bd3caf3c
|
Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."
* Unbent codex, singing the sorrow of aborted spoils.
* .
|
2019-06-23 06:00:27 -07:00 |
|
Ghommie
|
2e30b91567
|
Ports in microwave updates and its radial menu.
|
2019-06-23 06:10:49 +02:00 |
|
Ghommie
|
38bc8a4efd
|
Ports "Removes SSreligion"
|
2019-06-23 01:45:21 +02:00 |
|
Sishen
|
934c1c0624
|
smite the heretics
|
2019-06-22 17:27:33 -04:00 |
|
Ghommie
|
138535f9f6
|
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcade machines.
|
2019-06-22 23:15:51 +02:00 |
|
Ghommie
|
f97a4b3a78
|
changes.
|
2019-06-22 19:50:56 +02:00 |
|
Trilbyspaceclone
|
1d4f55cab2
|
makes tower shield be seeable
|
2019-06-22 13:34:08 -04:00 |
|
Ghommie
|
d71b50a4f1
|
Forgot we are dealing with a prototype object.
|
2019-06-22 17:23:32 +02:00 |
|
Ghommie
|
b85d4d6fb3
|
Sort of porting MRE rations from Yogstation.
|
2019-06-22 16:05:03 +02:00 |
|
Trilbyspaceclone
|
ed07e25371
|
Corrects the "Durasteel" to be plastitanium tool boxes
|
2019-06-21 03:45:15 -04:00 |
|
Ghommie
|
44a9fe9521
|
Fixes "Penlights Cannot Give Eye Exams"
|
2019-06-19 13:38:59 +02:00 |
|
Ghommie
|
55795355fd
|
Ports "[s] Fixes pride mirror exploit"
|
2019-06-19 03:31:36 +02:00 |
|
Ghommie
|
df9c4fd1f4
|
[s] Ports "Fixes PDA TK exploits"
|
2019-06-19 03:08:44 +02:00 |
|
Fermi
|
095ea1243b
|
Fits better.
|
2019-06-19 00:39:38 +01:00 |
|
Fermi
|
f5c98f5d57
|
Merge branch 'Dwarf' of https://github.com/Thalpy/Citadel-Station-13 into Dwarf
|
2019-06-19 00:17:30 +01:00 |
|
Fermi
|
fe6296b58a
|
Added crafting recipies as per Bhijin's request.
|
2019-06-19 00:17:18 +01:00 |
|
Ghommie
|
3e834004ec
|
Ports in bee plushes.
|
2019-06-18 23:31:09 +02:00 |
|
Ghommie
|
138e7871cc
|
copy pasta
|
2019-06-17 22:48:12 +02:00 |
|
Ghommie
|
c0d67af8d1
|
Fixing vape fuck ups.
|
2019-06-17 22:39:17 +02:00 |
|
Thalpy
|
1cc0724519
|
Merge branch 'master' into Dwarf
|
2019-06-17 12:09:55 +01:00 |
|
deathride58
|
b487b0103b
|
Merge pull request #8574 from Citadel-Station-13/durasteel_toolboxes
Adds 2 TC durasteel toolboxes {5 stamcost, 18 mob damage, 18+22+10 structural damage, does not fit in any kind of backpack}
|
2019-06-16 22:52:47 -04:00 |
|