Bjorn Neergaard
1319bd722d
Clean comments; adata on the serverside; update postcss; APC size
2016-01-03 19:18:55 -06:00
Bjorn Neergaard
9c1e05f57e
Increase tgui security by inlining for admins only; reduce cruft
2016-01-03 18:59:01 -06:00
tkdrg
e0a16b4467
Merge pull request #14304 from MMMiracles/snowbuck
...
Snowdin Edits
2016-01-03 21:11:13 -03:00
tkdrg
e3caa991b0
Merge pull request #14311 from MrStonedOne/patch-115
...
Makes sdql2 DELETE use qdel and not del
2016-01-03 21:04:45 -03:00
MrStonedOne
5d86ed49f6
Merge conflic fix
2016-01-03 14:51:14 -08:00
phil235
0b98fffeef
- Adds a visible message when the larva grows into a humanoid.
...
- Removes some duplicated code in alien growth code (larva-to-humanoid, praetorian and queen now all use the same proc).
- Alien drones can no longer evolve into a praetorian while inside a pipe (praetorian can't ventcrawl) or other containers.
- Removed an unneeded check in larva_evolve/fire().
- Fixes bug where a larva could evolve despite being incapacitated/dead during the selection of the alien caste.
- Remove outdated code in monkey/attack_hand about disarm and grab intent.
- Evolving into a royal alien no longer delets what you hold in your hands and the content of your stomach.
2016-01-03 23:19:30 +01:00
Nerd Lord
6450f937b2
abduct this
2016-01-03 16:56:34 -05:00
Bjorn Neergaard
34019aefd2
Clean up chem dispenser UI
2016-01-03 15:19:05 -06:00
Dorsisdwarf
6c7fcdbf9f
Parenthesis
2016-01-03 20:49:11 +00:00
Dorsisdwarf
ff13690537
Prevents infestation of corpses already containing a body_egg
2016-01-03 19:48:34 +00:00
tkdrg
8612333265
Merge pull request #14133 from KorPhaeron/follow
...
Adds follow links to all forms of chat
2016-01-03 16:31:11 -03:00
AnturK
4a3324b673
Adds away areas to ghost teleport/ admin jump list
2016-01-03 20:25:48 +01:00
Iamgoofball
51de33e3c4
haha whoops
2016-01-03 10:24:03 -08:00
Iamgoofball
d6a3fb42e2
Tesla nerf
...
It no longer bounces shocks nearly as far.
2016-01-03 10:23:24 -08:00
duncathan salt
18bf956737
Merge pull request #14292 from MrStonedOne/patch-113
...
Fixes byond trying to create a new /world/ object on admin proc calls
2016-01-03 18:13:39 +01:00
duncathan salt
041461b218
Merge pull request #14270 from lordpidey/grammarFix
...
Grammatical fix to Detective's Camera.
2016-01-03 18:12:15 +01:00
duncathan salt
9ee0f50cd9
Merge pull request #14285 from neersighted/tgui_followup
...
tgui followup
2016-01-03 18:00:43 +01:00
Bjorn Neergaard
1f4017855a
Add window locking system/sanity checks
...
This fixes complaints about windows ending up offscreen or resize
throwing a fit, hopefully
2016-01-03 10:43:03 -06:00
TrustyGun
dc1680dc78
Revert "resolving conflicts"
...
This reverts commit 5bba5448bd .
2016-01-03 08:52:05 -05:00
Mike Long
e6011aa1f0
Detectives camera is now a subtype. Changed maps to have the subtype instead of the modified regular camera.
2016-01-03 07:36:12 -05:00
AnturK
41f7d95aa4
Fixes mining bot being hard to repair.
...
Stops bruisepacks working on mining bot
2016-01-03 13:18:02 +01:00
TrustyGun
5bba5448bd
resolving conflicts
2016-01-03 06:01:14 -05:00
KorPhaeron
c8fd053e4b
Redundant check removed
2016-01-03 03:15:03 -06:00
KorPhaeron
fede7781a1
Forgot a letter
2016-01-03 03:01:47 -06:00
KorPhaeron
b33f38ee48
Statue
2016-01-03 03:01:04 -06:00
KorPhaeron
03a39b9542
Venus
2016-01-03 02:58:32 -06:00
KorPhaeron
0e26722fe6
Forgot alien hivemind
2016-01-03 01:41:26 -06:00
KorPhaeron
b3b579c60c
Adds Follow Links to everything
2016-01-03 01:33:16 -06:00
Razharas
6eb5e5016b
Merge pull request #14068 from Bawhoppen/revert-13901-new_clip_in
...
Reverts yelling about reloading
2016-01-03 10:03:09 +03:00
KorPhaeron
6b36c8b797
Leap Icon
2016-01-03 00:47:09 -06:00
KazeEspada
aec7bd9301
Fixes a runtime involving mobs that get deleted upon death.
2016-01-02 23:04:19 -07:00
tkdrg
926fe760b6
Merge pull request #14286 from KorPhaeron/cheribucks_secured
...
Fixes away mission area names
2016-01-03 02:58:22 -03:00
Aranclanos
29977a2d16
Merge pull request #14243 from KorPhaeron/darkness
...
Fixes floor is lava and advanced darkness
2016-01-03 02:54:21 -03:00
Aranclanos
871540e885
Merge pull request #14278 from MrStonedOne/patch-111
...
Patch for byond bug id:1905199
2016-01-03 02:48:08 -03:00
Aranclanos
9549090570
Merge pull request #14277 from KorPhaeron/goliath
...
Goliath fixes
2016-01-03 02:24:44 -03:00
KorPhaeron
28a0c48403
Moves spawn to weather
2016-01-02 23:21:46 -06:00
Aranclanos
e6d9711892
Merge pull request #14272 from KorPhaeron/AI_fix
...
Fixes borgs not getting 0 law, ion laws, etc
2016-01-03 02:19:22 -03:00
Shadowlight213
6534612c88
Changes from null to 0
2016-01-02 20:40:38 -08:00
Shadowlight213
0b14e9ec81
Reworks Green slime core blacklist to use a species flag
...
Adds synths to blacklist.
2016-01-02 20:34:16 -08:00
Kyle Spier-Swenson
675b0bc500
Removes comment that is no longer needed
2016-01-02 20:04:54 -08:00
tkdrg
47d704cb91
Merge pull request #14293 from phil235/HivebotLootFix
...
Fixes typo in hivebot loot causing a runtime.
2016-01-02 23:57:36 -03:00
MrStonedOne
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
Razharas
fd390009c7
Merge pull request #14252 from tkdrg/cablefix
...
Fixes cable_coil children not merging each other
2016-01-03 04:38:52 +03:00
KorPhaeron
9ce8c0d629
Goliath
2016-01-02 19:29:13 -06:00
Shadowlight213
5662676e5e
Makes attacks also log to the mob's mind.dm
...
Shows gibbed antags in the check antags panel.
2016-01-02 17:20:19 -08:00
Kyle Spier-Swenson
b791d86a4d
Makes sdql2 DELETE use qdel and not del
2016-01-02 16:09:09 -08:00
tkdrg
cf1a0c131f
Merge pull request #14254 from milocv/fixes
...
Adds NOBREATH check for smoke
2016-01-02 21:04:16 -03:00
duncathan
b18c6c2c5c
Merge branch 'master' of https://github.com/tgstation/-tg-station into listmos
...
Conflicts:
nano/assets/nanoui.js
nano/bower.json
nano/templates/atmos_filter.dot
2016-01-02 18:02:54 -06:00
Cheridan
717ac13557
Merge pull request #14262 from xxalpha/smoothballs
...
Refixes loaded map smoothing
2016-01-02 16:58:07 -06:00
Cheridan
d67e0075fc
Merge pull request #14253 from tkdrg/posimsg
...
Fixes posibrain feedback message
2016-01-02 16:48:37 -06:00