Joan Lung
fd7f65e7bd
If you're lucky enough to get multiple lifesteal crystal modkits you can actually make use of them
2017-06-09 20:55:52 -04:00
TrustyGun
1db56a3d58
Clown Toy Box + Wooden Crates ( #28227 )
2017-06-09 13:01:51 -03:00
Xhuis
46ded8a4ef
does the thing
2017-06-09 11:15:46 -04:00
Leo
1699b98f76
Merge pull request #28218 from optimumtact/hamish_the_cow_gets_brushed
...
Some other code now uses ai status display list
2017-06-09 11:28:22 -03:00
Jordie
2d568348bb
Merge pull request #28224 from lzimann/re
...
Fix related CID/IPs on player panel
2017-06-09 23:59:45 +10:00
Joan Lung
19f7169630
Merge pull request #28165 from Tacolizard/medalaf
...
Adds Medal Commendations!
2017-06-08 21:38:38 -04:00
Lzimann
8ec6fb1801
We don't want that happening
2017-06-08 21:45:20 -03:00
Lzimann
21eb0568b8
Changes Amanitin log message
2017-06-08 21:41:41 -03:00
Leo
1951edeb4f
Merge pull request #28194 from Cyberboss/patch-112
...
Fixes deadmin player panel runtime
2017-06-08 19:17:52 -03:00
bgobandit
93953835f6
You can no longer mount borgs while stunned. ( #28198 )
2017-06-08 19:16:55 -03:00
ShizCalev
f2d829261a
[Typo] Duffel Bag ( #28200 )
2017-06-08 19:16:20 -03:00
oranges
dfef4d93ea
Some other code now uses ai status display list
2017-06-08 21:16:58 +00:00
Jordan Brown
64566c33cb
Fix
2017-06-08 16:30:49 -04:00
Jordan Brown
23eb6e4aec
Merge upstream
2017-06-08 16:30:35 -04:00
Shadowlight213
16d4171230
Makes dismembered heads and brains respect NOCLONE
2017-06-08 13:07:31 -07:00
Jordan Brown
364e097335
Improve to_chat performance
2017-06-08 15:36:08 -04:00
Jordan Brown
e9b3a572be
More remnants
2017-06-08 15:17:27 -04:00
Jordan Brown
7623aa8bea
Bad comma
2017-06-08 15:11:26 -04:00
Jordan Brown
b2ed7f3cb6
better tabs
2017-06-08 15:02:07 -04:00
kevinz000
6659dd7c69
Update neck.dm
2017-06-08 11:10:32 -07:00
kevinz000
596ef51039
Merge remote-tracking branch 'tgstation/master' into gang_points_refactor
2017-06-08 11:05:12 -07:00
Jordan Brown
93e3fa18a2
Revert "Players cannot observe before PREGAME is reached"
2017-06-08 13:04:58 -04:00
Jordan Brown
f4ffde7a09
Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3
2017-06-08 12:54:27 -04:00
Jordan Brown
b6538c50e2
Fixes, css, removes changefont
2017-06-08 12:52:25 -04:00
Joan Lung
93bf75b576
Merge pull request #28178 from Expletive/detectivehair
...
Adds 91 new sprites for the Detective's Fedora and gives it some better booze.
2017-06-08 11:50:55 -04:00
Leo
fbf9f42a5d
Merge pull request #28170 from optimumtact/observerspeep
...
Players cannot observe before PREGAME is reached
2017-06-08 12:09:31 -03:00
Leo
c18b51a3ad
Merge pull request #28187 from Cyberboss/patch-108
...
Removes a spawn
2017-06-08 11:45:48 -03:00
Jordan Brown
178b208186
Trims whitelist entries and makes them use ckey() ( #28183 )
2017-06-08 11:45:32 -03:00
Leo
78e6b1af75
Merge pull request #28185 from Cyberboss/patch-111
...
Fixes ghosts not returning an initialize hint
2017-06-08 11:44:58 -03:00
Lzimann
4a693b209a
Byond is stupid sometimes
2017-06-08 11:12:11 -03:00
Lzimann
ccb3a86a84
Fix related CID/IPs on player panel
2017-06-08 10:52:47 -03:00
Leo
d95dc7413c
Removes xeno queen maid ( #28171 )
2017-06-08 13:32:08 +02:00
Expletive
0398128384
Adds light ( #28179 )
2017-06-08 12:31:03 +02:00
oranges
507ee7f223
Players cannot observe before PREGAME is reached
...
Ready | Not Ready | Observe is now a three way toggle
The player ready status has been refatored into an ENUM of the three
states, READY, NOT_READY and OBSERVING
if the tickerstate is at least PREGAME they will spawn as observers,
before then you can only register your interest
2017-06-08 06:46:38 +00:00
Jordan Brown
33fbd29bbe
Fixes IRC ahelps
2017-06-07 22:25:17 -04:00
oranges
7da58ff009
Removes the headpatting code and the slapping code ( #28028 )
2017-06-07 22:55:14 -03:00
QualityVan
02bb8d0dc4
Adds creamatoriums ( #28158 )
2017-06-07 22:44:38 -03:00
Expletive
18807306a0
Fixes 28154: Accidental cargo exploit edition. ( #28172 )
2017-06-07 22:41:30 -03:00
Joan Lung
985aab7b62
Merge pull request #28160 from QualityVan/ormplasteel
...
Fixes ORM alloy material consumption
2017-06-07 20:25:57 -04:00
Joan Lung
f069ec979c
Merge pull request #28162 from Expletive/soundbang
...
Refactors soundbang_act to use adjustEarDamage
2017-06-07 20:25:36 -04:00
Jordan Brown
5bbbd26739
Merge branch 'master' into goonchatv3
2017-06-07 20:06:46 -04:00
Tacolizard
2fca87efa5
better logging
2017-06-07 17:00:13 -07:00
Joan Lung
0b56e9af1d
Merge pull request #28080 from kevinz000/patch-208
...
adds proper gibtonite detonation timing
2017-06-07 19:45:32 -04:00
Tacolizard
369f7dd52e
BOLD
2017-06-07 16:39:57 -07:00
Tacolizard
0f3f323da7
add name to commendation
2017-06-07 16:29:30 -07:00
Tacolizard
258905e56f
add logging
2017-06-07 16:28:32 -07:00
kevinz000
aedc90be50
Update ores_coins.dm
2017-06-07 16:12:24 -07:00
kevinz000
365330c9e6
Update ores_coins.dm
2017-06-07 16:11:57 -07:00
Tacolizard
954c3a7abd
refactor outfit datum
2017-06-07 13:47:31 -07:00
Tacolizard
8038535eb1
Give the captain his medal back
2017-06-07 13:28:11 -07:00