 Poojawa
|
6b82c985ae
|
Revert "fuckit, I'm just gunna wholesale port from baycode I guess"
This reverts commit 11d10d3805.
|
2019-06-06 19:39:22 -05:00 |
|
|
Poojawa
|
2606dd0cdd
|
Revert "these too please thanks"
This reverts commit bc80c03679.
|
2019-06-06 19:39:17 -05:00 |
|
|
BlackMajor
|
c5f79c9da8
|
Fine i'll put it back in tools then, will that make you happy?
|
2019-06-07 12:30:34 +12:00 |
|
|
BlackMajor
|
21fd11718a
|
Bundled glue in with compression kit PR
|
2019-06-07 12:00:06 +12:00 |
|
|
Ghommie
|
5a69499927
|
Hol up, unrelated PR time, atomization.
|
2019-06-07 01:32:15 +02:00 |
|
|
Fermi
|
000b930811
|
Added Medolier (needs sprite)
|
2019-06-07 00:19:28 +01:00 |
|
|
Sishen
|
b9b219d561
|
adds redtail
|
2019-06-06 16:01:40 -04:00 |
|
|
Ghommie
|
d3d2b8d898
|
should be ready.
|
2019-06-06 19:24:20 +02:00 |
|
|
Ghommie
|
44358e054a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit29
|
2019-06-06 15:24:31 +02:00 |
|
|
Ghommie
|
0e630680ba
|
forgot to pull from upstream. One second.
|
2019-06-06 15:20:27 +02:00 |
|
|
Sishen
|
cf3002a392
|
slimeplush
|
2019-06-06 05:14:01 -04:00 |
|
|
Trilbyspaceclone
|
03132569a7
|
Update backpack.dm
|
2019-06-05 15:54:51 -04:00 |
|
|
Ghommie
|
af2598035a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-06-05 19:32:17 +02:00 |
|
|
Ghommie
|
0513f3464a
|
one
|
2019-06-05 19:20:25 +02:00 |
|
|
Poojawa
|
bc80c03679
|
these too please thanks
|
2019-06-05 04:55:49 -05:00 |
|
|
Poojawa
|
11d10d3805
|
fuckit, I'm just gunna wholesale port from baycode I guess
|
2019-06-05 04:55:36 -05:00 |
|
|
kevinz000
|
980c48180c
|
Merge pull request #8387 from JTGSZ/gangs
Ports gang mode
|
2019-06-05 01:55:19 -07:00 |
|
|
kevinz000
|
102d68a243
|
Merge pull request #8518 from Ghommie/Ghommie-cit27
Fixes and updates pod's emergency suits storage.
|
2019-06-05 01:41:23 -07:00 |
|
|
Fermi
|
228ab5b7c9
|
+Acute hepatic pharmacokinesis. (untested, will test with alterations)CC
|
2019-06-05 00:23:42 +01:00 |
|
|
Poojawa
|
9e01a078ec
|
lel
|
2019-06-03 20:06:25 -05:00 |
|
|
deathride58
|
b95b14d033
|
Merge pull request #8515 from Ghommie/Ghommie-cit25
Fixes stunbatons' icons not properly updating on cell fiddling, plus cell maxcharge leniency.
|
2019-06-03 17:51:13 -04:00 |
|
|
Poojawa
|
1f1f951924
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-06-03 05:35:52 -05:00 |
|
|
Fermi
|
a5b3ec7939
|
Acid changes.
|
2019-06-02 22:38:55 +01:00 |
|
|
Ghommie
|
6be3496d36
|
Merge branch 'Ghommie-cit15' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit15
|
2019-06-02 22:50:02 +02:00 |
|
|
Ghommie
|
a0898a779a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit15
|
2019-06-02 22:48:38 +02:00 |
|
|
Ghommie
|
472d7ef8cd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit27
|
2019-06-02 19:03:34 +02:00 |
|
|
Ghommie
|
73e279dada
|
excessive parenthesis wrapping.
|
2019-06-02 18:29:43 +02:00 |
|
|
Ghommie
|
d6e54bf237
|
Fixes and updates pod's emergency suits storage.
|
2019-06-02 18:28:30 +02:00 |
|
|
Ghommie
|
ae5d68c6f9
|
Fixes stunbatons' icons not properly updating on cell removal, and more cell charge leniency.
|
2019-06-02 13:24:03 +02:00 |
|
|
BurgerLua
|
e7802a9b03
|
Arcade Loot Improvements
|
2019-06-02 02:02:47 -07:00 |
|
|
Fermi
|
e58a94bcc7
|
Merge remote-tracking branch 'upstream/master'
|
2019-06-01 03:12:38 +01:00 |
|
|
kevinz000
|
8b27926fee
|
Merge pull request #8463 from Trilbyspaceclone/metal_shields
Makeshift Metal shield crafting
|
2019-05-31 18:00:12 -07:00 |
|
|
kevinz000
|
2a5bbfdafc
|
Merge pull request #8482 from Ghommie/Ghommie-cit22
fixes pacifism eyestabbing, better this time.
|
2019-05-31 17:59:33 -07:00 |
|
|
kevinz000
|
16c89da587
|
Merge pull request #8485 from Trilbyspaceclone/plushies
More plushies - Reece Trilby Bhijn Box Justin
|
2019-05-31 17:55:37 -07:00 |
|
|
kevinz000
|
a96e414d2f
|
Merge pull request #8486 from BlackMajor/Ooga
Supermatter no longer works while inside of a turf.
|
2019-05-31 17:40:30 -07:00 |
|
|
Trilbyspaceclone
|
9badda96d8
|
huh
|
2019-05-31 18:04:02 -04:00 |
|
|
Trilbyspaceclone
|
5e67974611
|
old file fixing
|
2019-05-31 18:01:22 -04:00 |
|
|
Trilbyspaceclone
|
aaaebe625b
|
old file fixes
|
2019-05-31 18:00:00 -04:00 |
|
|
Trilbyspaceclone
|
3891cf1ff6
|
Update sheet_types.dm
|
2019-05-31 17:54:49 -04:00 |
|
|
Trilbyspaceclone
|
96a32f7c3d
|
Update boxes.dm
|
2019-05-31 17:53:54 -04:00 |
|
|
BlackMajor
|
46123cb1fa
|
First attempt at making size change damage (doesn't work yet)
|
2019-06-01 02:45:14 +12:00 |
|
|
BlackMajor
|
2b1931c217
|
Compression kit can now shrink dicks. Also gives it way more feedback.
|
2019-06-01 00:42:40 +12:00 |
|
|
BurgerLua
|
5f94441cc7
|
Adds Clockwork Reflectors
|
2019-05-30 22:52:43 -07:00 |
|
|
Fermi
|
1461f46292
|
Added a catch to prevent acid from being rascals.
|
2019-05-31 03:12:00 +01:00 |
|
|
Trilbyspaceclone
|
5d80fb6811
|
Update backpack.dm
|
2019-05-30 15:04:45 -04:00 |
|
|
Trilbyspaceclone
|
a6e85a63ba
|
Update code/game/objects/items/plushes.dm
Co-Authored-By: Useroth <37159550+Useroth@users.noreply.github.com>
|
2019-05-30 11:14:31 -04:00 |
|
|
BlackMajor
|
0d06605662
|
Supermatter eats the closed turf it's inside.
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
|
2019-05-30 16:17:33 +12:00 |
|
|
BlackMajor
|
4cfb473e3a
|
Update
Fixes merge conflict with gangs.
Adds a little feedback.
Fixes crystal eating.
|
2019-05-30 12:23:57 +12:00 |
|
|
Trilbyspaceclone
|
027ee1e596
|
Update plushes.dm
|
2019-05-29 16:40:41 -04:00 |
|
|
BlackMajor
|
93464b8f24
|
Adds bluespace compression kit
|
2019-05-30 02:46:34 +12:00 |
|