Ghommie
|
28d3747c5e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-06-24 16:55:10 +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 |
|
Ghommie
|
9f0278c34f
|
map merging.
|
2019-06-24 06:13:42 +02:00 |
|
Ghommie
|
fd68236594
|
ports "More variety for dorms bedsheets" + 3 new bed sheets.
|
2019-06-24 05:54:14 +02:00 |
|
Ghommie
|
71298c084d
|
didn't init the list, bravo.
|
2019-06-24 03:09:43 +02:00 |
|
Trilbyspaceclone
|
e9f36b79bb
|
Merge branch 'master' into meme_tools
|
2019-06-23 21:07:55 -04:00 |
|
Trilbyspaceclone
|
ede0bbe89e
|
Merge branch 'master' into patch-185
|
2019-06-23 20:56:25 -04:00 |
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
TrilbySpaceClone
|
05416b8f53
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into patch-176
|
2019-06-23 13:00:17 -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
|
a2d896351b
|
Sort of porting "Changes the type pathing of some "random" items"
|
2019-06-23 07:10:11 +02: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 |
|
TrilbySpaseClone
|
51119ad6fd
|
tools
|
2019-06-22 15:37:28 -04: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 |
|
kevinz000
|
ee14446a6e
|
Update RCD.dm
|
2019-06-20 14:47:54 -07:00 |
|
kevinz000
|
6a8a7dd604
|
Update RCD.dm
|
2019-06-20 14:17:21 -07: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 |
|
Trilbyspaceclone
|
d3cbbe708c
|
Update misc.dm
|
2019-06-17 14:20:11 -04:00 |
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
Thalpy
|
1cc0724519
|
Merge branch 'master' into Dwarf
|
2019-06-17 12:09:55 +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 |
|
kevinz000
|
9c50b9cb11
|
typo
|
2019-06-16 19:58:07 -07: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 |
|
deathride58
|
7b329ae824
|
Merge pull request #8593 from Citadel-Station-13/changeling_adrenaline
Fixes adrenaline (it didn't actually work). Replaces traitor/ling adrenal omnizine with regenjelly (3x faster, but lasts shorter too), reworks changeling adrenals to scale burst stamina heal rather than flat 100
|
2019-06-16 22:51:03 -04:00 |
|
kevinz000
|
28ca8dee46
|
Merge pull request #8648 from Trilbyspaceclone/patch-178
Buffs uplink kits
|
2019-06-16 19:47:09 -07:00 |
|
kevinz000
|
78c969a9cb
|
Merge pull request #8584 from Trilbyspaceclone/patch-172
Organ Storage box
|
2019-06-16 19:43:10 -07:00 |
|
kevinz000
|
27d7dc430f
|
Merge pull request #8497 from BurgerLUA/Clockwork-Reflectors
Adds Clockwork Reflectors
|
2019-06-16 19:41:57 -07:00 |
|
kevinz000
|
27333276de
|
Merge pull request #8570 from Trilbyspaceclone/patch-170
Ports origami skills for paper wiz loot
|
2019-06-16 19:40:01 -07:00 |
|
kevinz000
|
1739ee1685
|
Merge pull request #8578 from Ghommie/Ghommie-cit41
Clears up Extinguisher's slippery instructions.
|
2019-06-16 19:38:23 -07:00 |
|
kevinz000
|
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 |
|