Commit Graph

24890 Commits

Author SHA1 Message Date
Jordie ddc4b16c64 Merge pull request #14322 from MrStonedOne/spawnremovals
removes a bunch of unneeded timer less spawns
2016-01-04 18:21:36 +11:00
Bjorn Neergaard 453f149be5 Fix tgui states
This led to a few in-game exploits it seems
2016-01-04 00:02:28 -06:00
Bjorn Neergaard 1b5438851a Treat assets as binary; fix sizes once and for all 2016-01-03 23:09:14 -06:00
PKPenguin321 beaa3efd18 experimentor typo fix
fixes a small typo
2016-01-03 21:07:53 -08:00
Michael Gartley 3cf26018de Small grammar fix to shielded message.
Fixes #14297

Added span class and reworded message while trying to keep the flavour
of text.

NB: This time I hopefully wont be such a pleb when trying to help.
2016-01-04 04:14:20 +00:00
Bjorn Neergaard 1955b8c2df Fix a couple typos with the Air Alarm UI 2016-01-03 21:45:57 -06:00
swankcookie a7508350e5 Gives /cleanable.dm "anchored = 1" 2016-01-03 20:43:48 -06:00
swankcookie 3b1e2d39ec Anchors cockroach guts
Signed-off-by: swankcookie <__X__>
2016-01-03 20:11:31 -06:00
MrStonedOne 6632a4c547 fixes explosions 2016-01-03 17:42:04 -08:00
Lularian cb50a25772 gives barman his cool stuff again 2016-01-03 19:35:49 -06:00
Bjorn Neergaard 1319bd722d Clean comments; adata on the serverside; update postcss; APC size 2016-01-03 19:18:55 -06:00
bawhoppen 3543175c51 Revert "fixes attempt two" 2016-01-03 19:05:52 -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
tkdrg 473eb8291e Merge pull request #14216 from Bawhoppen/czechfixes2
fixes attempt two
2016-01-03 21:02:20 -03:00
Lularian f5bc4b6b4f woops 2016-01-03 17:50:20 -06: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
Nerd Lord 8dfd29e84d Adds follow links to overmind and revenant chat 2016-01-03 15:49:16 -05: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 e1828f363e nerfs machine bounce range 2016-01-03 10:25:10 -08: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
AnturK bbaca08f74 Restores default chameleon projector disguise 2016-01-03 19:19:17 +01:00
AnturK ff6d88f4e6 Fixes injectors spawned before mutation table is ready 2016-01-03 18:49:10 +01:00
duncathan salt 01ad623602 Merge pull request #14296 from AnturK/refix
Fixes gas overlays using turf color
2016-01-03 18:13:51 +01: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
phil235 78295d8238 Fixes runtime when trying to cremate an animal that deletes itself upon death (mouse, cockroach). 2016-01-03 18:11:18 +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
AnturK 89b612ad15 Removes unused ?module? code 2016-01-03 14:55:18 +01: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
AnturK 5738de679b Fixes changeling form swap 2016-01-03 12:08:57 +01:00
TrustyGun 5bba5448bd resolving conflicts 2016-01-03 06:01:14 -05:00
Razharas 10b74eb793 Merge pull request #14174 from Buggy123/Buggy123-IEDBUFF2
Buffs IEDS 2: electric boogaloo
2016-01-03 13:17:42 +03:00
KorPhaeron 8a72f5a55c Fixes cyborg teleport 2016-01-03 04:11:19 -06: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