 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 |
|
|
BurgerLua
|
c98d2ce5a0
|
nuke be gone
|
2019-06-02 15:21:45 -07: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
|
e6e06a1a43
|
Makes clockwork wall - sonic jackhammer interaction account the wall's superheating.
|
2019-06-02 13:59:36 +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 |
|
|
BurgerLua
|
d67b179bff
|
RCD Memes
|
2019-05-31 20:32:17 -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
|
07d3b0361c
|
Merge pull request #8466 from Poojawa/vis-overlay-insolence
Fixes atmos and station alert consoles not updating visually
|
2019-05-31 17:44:39 -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 |
|
|
Ghommie
|
8fbc25ad77
|
Ports in combat gloves plus.
|
2019-05-29 16:35:56 +02:00 |
|
|
Ghommie
|
bcf1072399
|
fixes eyestabbing, better this time.
|
2019-05-29 10:08:00 +02:00 |
|
|
Fermi
|
ae35366e97
|
Some fixes before bed.
|
2019-05-29 05:41:12 +01:00 |
|
|
Fermi
|
91cfd8e052
|
Before say component remove.
|
2019-05-29 03:01:47 +01:00 |
|
|
kevinz000
|
8cd0b69b61
|
adrenals
|
2019-05-28 01:00:41 -07:00 |
|
|
Trilbyspaceclone
|
7a17ca381b
|
tweaks
|
2019-05-27 21:58:09 -04:00 |
|
|
kevinz000
|
e8036a8a9b
|
Merge pull request #8439 from Ghommie/Ghommie-cit18
stunbaton status rework.
|
2019-05-27 14:08:52 -07:00 |
|
|
Fermi
|
79a7b6b45b
|
Fixes.
|
2019-05-27 20:25:57 +01:00 |
|
|
JTGSZ
|
93813613aa
|
Some changes.
|
2019-05-27 14:42:07 -04:00 |
|
|
Poojawa
|
333964fe02
|
Fixes atmos and station alert consoles not updating visually
|
2019-05-27 06:33:30 -05:00 |
|
|
kevinz000
|
e0a0be9e4e
|
Merge pull request #8440 from BurgerLUA/Sensor-Improvement
Improves Crew Monitoring Console Sorting
|
2019-05-27 03:30:39 -07:00 |
|
|
Trilbyspaceclone
|
6633ff4533
|
grammar
|
2019-05-27 04:47:56 -04:00 |
|
|
Trilbyspaceclone
|
f2ee85371d
|
Update shields.dm
|
2019-05-27 04:40:47 -04:00 |
|
|
Ghommie
|
37aa491fa5
|
removes emp downtime, Kev's request.
|
2019-05-27 02:30:03 +02:00 |
|
|
dtfe3
|
f56960ff88
|
Fract said max 35
|
2019-05-27 00:39:48 +02:00 |
|
|
dtfe3
|
38a6c1f917
|
Decreased the increase from 45 to 40
|
2019-05-27 00:22:50 +02:00 |
|