kevinz000
|
32d81b8624
|
Merge pull request #736 from Citadel-Station-13/upstream-merge-26803
[MIRROR] Gives ears, eyes, and vocal cords plural gender
|
2017-05-06 21:24:15 -07:00 |
|
kevinz000
|
b7621ff9fe
|
Merge pull request #813 from Citadel-Station-13/upstream-merge-26937
[MIRROR] Elevators
|
2017-05-06 20:57:55 -07:00 |
|
kevinz000
|
db50cc8c94
|
Merge pull request #812 from Citadel-Station-13/upstream-merge-26949
[MIRROR] ORM fixes
|
2017-05-06 20:57:17 -07:00 |
|
kevinz000
|
bfe7441f9b
|
Merge pull request #791 from Citadel-Station-13/upstream-merge-26867
[MIRROR] Holy water will now properly make you jittery
|
2017-05-06 15:41:24 -07:00 |
|
kevinz000
|
4a2a0e8a0d
|
Merge pull request #732 from Citadel-Station-13/upstream-merge-26778
[MIRROR] Plasma vessels regenerate slowly off resin
|
2017-05-06 15:26:10 -07:00 |
|
CitadelStationBot
|
df204497cd
|
Elevators
|
2017-05-06 16:29:50 -05:00 |
|
kevinz000
|
d43e64bcc3
|
Merge pull request #774 from Citadel-Station-13/upstream-merge-26805
[MIRROR] Fixes SM Tesla admin log spam, adds containment field count to investigate logs.
|
2017-05-06 14:24:08 -07:00 |
|
kevinz000
|
e5249ff8d0
|
Merge pull request #764 from Citadel-Station-13/upstream-merge-26855
[MIRROR] Makes dental implants move through dismemberment
|
2017-05-06 14:23:03 -07:00 |
|
kevinz000
|
329190d660
|
Merge pull request #809 from Citadel-Station-13/upstream-merge-26933
[MIRROR] Makes medbay vending machines buildable
|
2017-05-06 14:22:08 -07:00 |
|
CitadelStationBot
|
d7bdb49283
|
ORM fixes
|
2017-05-06 16:20:39 -05:00 |
|
kevinz000
|
b6231af063
|
Merge pull request #682 from Citadel-Station-13/upstream-merge-26731
[MIRROR] Buffs mercury and lithium [Travis error unrelated to PR]
|
2017-05-06 14:08:51 -07:00 |
|
kevinz000
|
cc8d113c0f
|
Merge branch 'master' into upstream-merge-26928
|
2017-05-06 14:05:16 -07:00 |
|
kevinz000
|
3e1a1588b5
|
Merge pull request #805 from Citadel-Station-13/upstream-merge-26927
[MIRROR] Replaces stun/weaken from Miner's salve
|
2017-05-06 14:04:56 -07:00 |
|
kevinz000
|
bf5a9a5037
|
Update mob.dm
|
2017-05-06 14:04:17 -07:00 |
|
kevinz000
|
d3d335d835
|
Update mob.dm
|
2017-05-06 14:03:52 -07:00 |
|
kevinz000
|
8af1d05cc4
|
Delete mob.dm.rej
|
2017-05-06 14:02:42 -07:00 |
|
kevinz000
|
5aff0de6dd
|
Merge pull request #737 from Citadel-Station-13/upstream-merge-26811
[MIRROR] adds a safety catch to spin()
|
2017-05-06 14:02:14 -07:00 |
|
kevinz000
|
6f90d11a38
|
Merge pull request #787 from Citadel-Station-13/upstream-merge-26913
[MIRROR] Players may no longer commite suicide
|
2017-05-06 12:21:57 -07:00 |
|
CitadelStationBot
|
30f7e170a3
|
Makes medbay vending machines buildable
|
2017-05-06 13:52:12 -05:00 |
|
kevinz000
|
b440ba70b0
|
Delete suicide.dm.rej
|
2017-05-06 11:49:26 -07:00 |
|
kevinz000
|
c5f7644452
|
Update suicide.dm
|
2017-05-06 11:48:24 -07:00 |
|
CitadelStationBot
|
10846d5d37
|
Replaces stun/weaken from Miner's salve
|
2017-05-06 10:48:07 -05:00 |
|
LetterJay
|
32651c31cb
|
Merge pull request #743 from Citadel-Station-13/upstream-merge-26806
[MIRROR] Hopefully makes flightsuit processing less taxing on the server
|
2017-05-06 10:26:16 -05:00 |
|
CitadelStationBot
|
b993d9ad23
|
Holy water will now properly make you jittery
|
2017-05-05 18:33:34 -05:00 |
|
CitadelStationBot
|
7288549dec
|
Players may no longer commite suicide
|
2017-05-05 18:08:56 -05:00 |
|
LetterJay
|
bd90067ed1
|
Merge pull request #781 from Citadel-Station-13/upstream-merge-26899
[MIRROR] Tesla light
|
2017-05-05 15:37:20 -05:00 |
|
CitadelStationBot
|
55c71ff5a9
|
Tesla light
|
2017-05-05 10:27:18 -05:00 |
|
LetterJay
|
acf8cb1597
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26876
|
2017-05-05 10:26:02 -05:00 |
|
LetterJay
|
1bb43eb7ae
|
woo
|
2017-05-05 10:21:53 -05:00 |
|
LetterJay
|
811c74b45d
|
Merge pull request #701 from Citadel-Station-13/upstream-merge-26477
[MIRROR] Subsystem change for the SM and TEG and slight QoL
|
2017-05-05 10:20:11 -05:00 |
|
LetterJay
|
caaf0fc2ee
|
Merge pull request #698 from Citadel-Station-13/upstream-merge-25743
[MIRROR] Holocalls
|
2017-05-05 10:19:28 -05:00 |
|
LetterJay
|
bbf43a464a
|
yey
|
2017-05-05 10:00:17 -05:00 |
|
LetterJay
|
590aaf4cc2
|
Merge pull request #773 from Citadel-Station-13/upstream-merge-26807
[MIRROR] Mobs that are faking death won't bleed.
|
2017-05-05 09:44:36 -05:00 |
|
LetterJay
|
f6f56a8b8f
|
Merge pull request #728 from Citadel-Station-13/upstream-merge-26823
[MIRROR] Ports pastries to Initialize
|
2017-05-05 09:43:17 -05:00 |
|
LetterJay
|
5d0f7eafaa
|
Merge pull request #719 from Citadel-Station-13/upstream-merge-26771
[MIRROR] Removes vestigial list from minds.
|
2017-05-05 09:40:28 -05:00 |
|
LetterJay
|
2f44824951
|
Merge pull request #717 from Citadel-Station-13/upstream-merge-26767
[MIRROR] The alien hivemind uses a mob's real_name
|
2017-05-05 09:40:08 -05:00 |
|
LetterJay
|
1198a3cbb4
|
Merge pull request #708 from Citadel-Station-13/upstream-merge-26752
[MIRROR] Plants now react with turfs on squash()
|
2017-05-05 09:39:17 -05:00 |
|
LetterJay
|
da4e4bbefe
|
Merge pull request #707 from Citadel-Station-13/upstream-merge-26746
[MIRROR] Makes admin sound announcement use the right span
|
2017-05-05 09:39:04 -05:00 |
|
LetterJay
|
91f3059be1
|
Merge pull request #693 from Citadel-Station-13/upstream-merge-26722
[MIRROR] Moves tips from config to strings tree
|
2017-05-05 09:33:45 -05:00 |
|
CitadelStationBot
|
745c74c18b
|
Fixes spinning (Woops I used a <= instead of a <)
|
2017-05-05 00:04:35 -05:00 |
|
CitadelStationBot
|
1da6f676f0
|
Fixes SM Tesla admin log spam, adds containment field count to investigate logs.
|
2017-05-04 20:59:33 -05:00 |
|
CitadelStationBot
|
d67618815c
|
Mobs that are faking death won't bleed.
|
2017-05-04 20:59:29 -05:00 |
|
CitadelStationBot
|
f7d45f3010
|
Fixes say verbs not working
|
2017-05-04 18:41:04 -05:00 |
|
CitadelStationBot
|
95495ffbcb
|
Makes dental implants move through dismemberment
|
2017-05-04 18:21:36 -05:00 |
|
CitadelStationBot
|
0639a54346
|
Hopefully makes flightsuit processing less taxing on the server
|
2017-05-04 06:01:53 -05:00 |
|
CitadelStationBot
|
0dff1569a1
|
adds a safety catch to spin()
|
2017-05-03 22:22:23 -05:00 |
|
CitadelStationBot
|
b7d451cbe9
|
Gives ears, eyes, and vocal cords plural gender
|
2017-05-03 22:22:19 -05:00 |
|
CitadelStationBot
|
3deafbe39b
|
Plasma vessels regenerate slowly off resin
|
2017-05-03 22:21:58 -05:00 |
|
CitadelStationBot
|
8a221b9637
|
Ports pastries to Initialize
|
2017-05-03 05:55:15 -05:00 |
|
CitadelStationBot
|
4141b6549f
|
Adds eyeball soup and spaghetti to the game: it's now been 8 days edition
|
2017-05-03 01:42:35 -05:00 |
|