LetterJay
6c39e94bba
Update observer.dm
2017-12-19 17:56:52 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
duncathan salt
0f2fd05e87
removes silly garbage defines
2017-12-19 08:02:18 -06:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
XDTM
6b4099805f
[Ready] Adds abductor Mind Interface Devices, and a gland HUD ( #33209 )
...
* Adds abductor Mind Interface Devices, and a gland HUD
* .
2017-12-18 20:29:37 -06:00
LetterJay
8fef308d0a
Update living_defense.dm
2017-12-18 17:27:04 -06:00
LetterJay
64f003d3b1
Update living.dm
2017-12-18 17:26:25 -06:00
LetterJay
0d137f82d4
Update life.dm
2017-12-18 17:26:10 -06:00
LetterJay
8b56d1ccdd
Update combat.dm
2017-12-18 17:26:01 -06:00
LetterJay
078c8744e0
Update species.dm
2017-12-18 17:25:47 -06:00
LetterJay
e4d6f4110f
Update human_defense.dm
2017-12-18 17:25:33 -06:00
LetterJay
10eaeed06b
Update carbon.dm
2017-12-18 17:25:09 -06:00
XDTM
13dd125e28
[HIGH PRIORITY]Hotfix for the monkeylike disability
2017-12-18 16:11:27 -06:00
LetterJay
e933d69a22
Merge pull request #4429 from Citadel-Station-13/upstream-merge-33302
...
[MIRROR] Spinning resin or laying eggs on vents prompts the user if they're sure
2017-12-18 15:27:12 -06:00
LetterJay
ba5306c8fe
Merge pull request #4415 from Citadel-Station-13/upstream-merge-33568
...
[MIRROR] Fixes zombie stun immunity, more pep in their step
2017-12-18 15:25:13 -06:00
LetterJay
3df26e3be6
Merge pull request #4413 from Citadel-Station-13/upstream-merge-33569
...
[MIRROR] Fixes a brain login runtime
2017-12-18 15:20:48 -06:00
LetterJay
8662e4a53c
Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050
...
[MIRROR] Mi-go
2017-12-18 15:20:00 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
LetterJay
8fde63e016
Update simple_animal.dm
2017-12-18 15:15:34 -06:00
LetterJay
bd1c186111
Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181
...
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
2017-12-17 21:26:08 -06:00
LetterJay
6aa1a86f88
Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529
...
[MIRROR] Removed drone light in favor of night vision
2017-12-17 20:37:39 -06:00
LetterJay
3895eb9eac
Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519
...
[MIRROR] Finishes the forceMove port
2017-12-17 20:28:07 -06:00
vuonojenmustaturska
8cbad06f35
Advanced mob laziness
2017-12-17 19:36:04 -06:00
coiax
e93bb49994
Spinning resin or laying eggs on vents prompts the user if they're sure ( #33302 )
...
add: Aliens (and humans with alien organs) are unable to create resin
structures or lay eggs atop vents or scrubbers.
This stops stupid aliens from obscuring entrances to the very helpful
and useful atmospheric piping system.
2017-12-17 19:27:45 -06:00
LetterJay
1c380e3ed4
Update verbs.dm
2017-12-17 17:50:05 -06:00
LetterJay
5c3b500ba9
Update camera.dm
2017-12-17 17:38:00 -06:00
XDTM
962f135957
[Ready]Brain Trauma additions
2017-12-17 11:11:10 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
Robustin
be6a0e82ff
Slightly faster, more stunnable ( #33568 )
2017-12-17 04:11:32 -06:00
vuonojenmustaturska
3fc98677a0
Fixes a brain login runtime ( #33569 )
...
* Fixes a silly brain meme
* better
2017-12-17 04:11:17 -06:00
Armhulen
8a0aa32335
Mi-go
2017-12-17 04:11:01 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
MoreRobustThanYou
2f8d49de91
[READY] Monkey mode overhaul
2017-12-15 18:35:52 -06:00
deathride58
b1efb191bc
fixes brain_damage_lines.json compile errors
2017-12-15 16:35:07 -08:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
Trevor Serpas
f7a943575d
Removed drone light in favor of night vision
2017-12-15 03:26:35 -06:00
deathride58
fdb9de488e
Merge pull request #4359 from Citadel-Station-13/upstream-merge-33480
...
[MIRROR] Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-15 04:21:34 +00:00
deathride58
d2d9cd7fc2
Update logout.dm
2017-12-14 19:12:27 -05:00
vuonojenmustaturska
c27c52cf58
Player Z-tracking, again
2017-12-14 17:35:35 -06:00
Ashe Higgs
2aef00daf0
All-In-One grinder results are now defined by type, not by huge lists
2017-12-14 15:48:39 -06:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
AnturK
7c0b21012f
Adds blob roundend report. ( #33463 )
...
* Adds blob roundend report. (Also adminabuse)
* Old comment
* Grammer
* Moves antag to seperate file
2017-12-14 01:39:36 -06:00
deathride58
7ca4a29cac
Merge pull request #4354 from Citadel-Station-13/upstream-merge-33465
...
[MIRROR] Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-14 03:54:31 +00:00
deathride58
fb492b5a14
Merge pull request #4355 from Citadel-Station-13/upstream-merge-33494
...
[MIRROR] Fixes two unrelated runtimes
2017-12-14 03:54:08 +00:00
Kyle Spier-Swenson
55247e9bdf
Deadmin tweaks: Admins without +AUTOLOGIN start deadmined. AUTOLOGIN defaults to on.
2017-12-13 21:04:00 -06:00
deathride58
b11d1c024e
Merge pull request #4342 from Citadel-Station-13/upstream-merge-33496
...
[MIRROR] Fixes lobby stat entries not showing
2017-12-13 21:48:14 +00:00
Leo
51cce087d8
Fixes two unrelated runtimes
2017-12-13 14:12:26 -06:00
vuonojenmustaturska
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
deathride58
dc7dd2da3c
Update dead.dm
2017-12-13 12:05:09 -05:00
Jordan Brown
129cd705d1
Correctly set description of nonstandard cells
2017-12-13 09:12:55 -06:00
