Commit Graph

12467 Commits

Author SHA1 Message Date
phil235 00fdd0eded Monkeys and xeno can flush disposal units. 2015-03-07 22:22:06 +01:00
phil235 fdc0399a46 Ventcrawlers can now climb into disposal by themselves. 2015-03-07 20:03:25 +01:00
Remie Richards 643de0c922 Hostile mobs no longer run all their hostile targeting/hunting code if there is nobody (or item, for those that hunt items) near them, they simply move to a simpler loop that decides whether to let the main loop continue. 2015-03-07 18:46:02 +00:00
phil235 77d553e619 Fixes disposal climbing.
Aliens, slimes and monkeys can climb into disposal but cannot flush it.
Non carbon mobs can no longer climb into disposal by themselves.
Stuffing another mob in a disposal unit is now only done via grabbing.(fixes bugs like stuffing someone while being inside the disposal yourself)
Large mobs no longer fit inside disposal.
Fixes hydrotray growing overlay layer.
Fixes slicing broken pipes dropping a straight pipe.
Fixes typos.
Removing unused var from disposal.
2015-03-07 19:35:44 +01:00
Remie Richards 04dcfaddcf Merge pull request #8135 from Miauw62/adminjumpfixes
Fixes adminjump being dumb.
2015-03-07 18:17:41 +00:00
Miauw f84f6aafcd Fixes adminjump being dumb. 2015-03-07 19:00:48 +01:00
Iamgoofball 50f5951115 Nerfs acid blob again
goddamn acid blob
2015-03-07 09:51:01 -08:00
Cheridan 95e269e211 Merge pull request #8122 from Xhuis/miners_messiah
Adds the ore satchel of holding
2015-03-06 15:15:40 -06:00
Incoming5643 febd47c6d6 byond inline spell checker fucking when 2015-03-06 15:20:56 -05:00
hornygranny 68c791ee7c Merge pull request #7751 from RemieRichards/ProceduralGeneration
Procedural Map Generator System
2015-03-06 11:49:21 -08:00
hornygranny d61cf2b022 Merge pull request #8107 from Cheridan/loot_ops
Nuke Op Loot Pinata Tweaks
2015-03-06 11:48:07 -08:00
xxalpha 13e291a4e9 Merge remote-tracking branch 'upstream/master' into catwalkmachines
Conflicts:
	code/game/turfs/turf.dm
	code/modules/power/power.dm
2015-03-06 19:19:09 +00:00
xxalpha f0c3c9af07 Merge remote-tracking branch 'upstream/master' into cyberimplants 2015-03-06 18:52:25 +00:00
xxalpha 38bae63251 Added cybernetic implants and surgery. 2015-03-06 18:52:04 +00:00
phil235 346007201b Fixes vines not releasing mobs from their grip when destroyed. 2015-03-06 19:35:50 +01:00
Cheridan d5ec11b91c Merge pull request #8080 from Incoming5643/Appearance_fix
Tweaks and fixes for the appearance window
2015-03-06 12:20:24 -06:00
phil235 d4de07d336 Fixes ghostburger and appendixburger icons. 2015-03-06 12:38:08 +01:00
Cheridan 6b512f663a Merge pull request #8137 from Incoming5643/so_misunderstood
Removes the Spooky
2015-03-06 00:09:25 -06:00
Cheridan 9cf4a0bfc6 Merge pull request #8114 from phil235/CookTrash
Cooking fixes for meat and trash
2015-03-05 23:54:29 -06:00
Cheridan 8fa6b3edea Merge pull request #8140 from phil235/doughbeakerfix
Improvised heating fixes
2015-03-05 22:58:44 -06:00
MrStonedOne b0b4d7f580 IsBanned() now rejects blank ckeys/ips/cids
Also removes the admin notice. Its still logged, but this way the admins don't get spammed during world reboot.
2015-03-05 19:35:33 -08:00
Cheridan 07676b352d Merge pull request #8128 from Ikarrus/gangfixup
Makes Gang mode functional again
2015-03-05 21:11:59 -06:00
Cheridan 50b8e2267e Merge pull request #8146 from phil235/HydroTrayLightsSpritesFix
Fixes HydroTray Lights sprites.
2015-03-05 20:28:33 -06:00
AnturK 27c0ea067f Fixes pref flags 2015-03-05 21:35:33 +01:00
Incoming 546c5eedc4 if you have AI or cyborg set to high, you'll see that in the preview window instead of a nondescript naked human 2015-03-05 14:23:19 -05:00
Swag McYolosteinen a341fd72b0 Merge pull request #8065 from paprka/squiddeath
Rebalances thermals
2015-03-05 19:14:57 +01:00
Swag McYolosteinen 372e082c66 Merge pull request #8013 from paprka/altclick
Alt-click for aesthetic toggling
2015-03-05 19:12:07 +01:00
Swag McYolosteinen 93a5ba6e16 Merge pull request #8132 from MrStonedOne/wellthen
Fixes irc alerts of adminhelps not showing the ckey
2015-03-05 19:02:15 +01:00
Miauw 82bc75c263 Moves chat toggles into their own variable. 2015-03-05 18:38:07 +01:00
Razharas 2a3c211d81 Merge pull request #8131 from Jordie0608/sooneverythingwillbechangelogs
Re-adds changelog popup as a config option
2015-03-05 12:06:19 +03:00
Jordie0608 a7e23d672a Improves drill's handling of power 2015-03-05 17:12:12 +11:00
Cheridan f68fd02d26 Merge pull request #8101 from MrPerson/alert_alert_ur_a_faget
On screen alert system
2015-03-04 19:39:04 -06:00
Cheridan e2554c55e6 Merge pull request #8147 from Cheridan/master
Manual Merge of #7607
2015-03-04 00:39:34 -06:00
Cheridan 56b0c321ac Merge branch 'BlobReroll' of git://github.com/RemieRichards/-tg-station into RemieRichards-BlobReroll
Conflicts:
	code/game/gamemodes/blob/overmind.dm
2015-03-04 00:33:44 -06:00
Cheridan 3fd821bdd7 Merge pull request #7986 from phil235/TaserJitterFix
Fixes taser stun duration
2015-03-04 00:01:49 -06:00
Iamgoofball 15bc4760a7 fixes 2015-03-03 21:46:38 -08:00
Iamgoofball b98c5584df NEWCRIT + other changes 2015-03-03 21:35:30 -08:00
phil235 12d677a97b Fixes HydroTray Lights sprites. 2015-03-04 02:08:34 +01:00
Incoming 6de8b0bd0c Enforces :3 on docile slimes, gives newly sentient creatures some direction on not wasting their creators, and fixes spelling errors 2015-03-03 17:12:46 -05:00
Incoming 8192ea7e06 Removes the paths to get skeletons and zombies in normal play but also does not nerf them. They can still be found through a few very rare mutation chances (I think?) and wizbiz. 2015-03-03 16:55:02 -05:00
Incoming c28d8ff7d0 Adds the ability for admins to "take the shot" and end rounds at their discretion. This is behind a two confirmation gate with a 20 second reflection period between them. All this is logged.
When mulligan antag is set to kick in, the suggestion for admins to end the round if they feel enough has happened is given. The option can also be found on the check antagonist panel.

The check antagonist panel will show what the muligan roundtype is if it exists.

If absolutely no one wants/can be the midround antags, the round ends there.

The round will end no matter what if the primary antagonist survived over an hour before biting it (unless the shuttle is already past the point of no return, in which case a peaceful ending takes priority)

Adds force_ending to VV editing protection, to avoid admins trying to shinanigans it on.
2015-03-03 16:39:01 -05:00
phil235 bb10824737 Improvised heating fix: Fixes dough recipe from egg + 15u flour beaker.
Adds a limit to how hot the beaker reagents can be heated. (no hotter than the heat source)
moving reagent_containers/attackby() to reagents/reagent_containers.dm for better visibility.
2015-03-03 22:35:11 +01:00
Remie Richards d36488e5a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into NecromanticStone
Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	icons/obj/wizard.dmi
2015-03-03 20:58:38 +00:00
Incoming5643 f5e1b851dc Updating from the git web interface is a bad idea, you shouldn't do it! 2015-03-03 15:50:40 -05:00
Remie Richards 2d70141cd8 Allows admins (or coders if worn icons go the way of inhands) to specify an alternate file to load worn states from. 2015-03-03 20:23:26 +00:00
Incoming a028062624 Skeletons and zombies lose temperature immunity and radiation immunity, reducing how awesome they are in the face of their relative ease of access. They still don't breathe or have blood. 2015-03-03 14:46:32 -05:00
Xhuis 2499ed82f4 Adds the ore satchel of holding 2015-03-03 07:26:58 -05:00
Miauw d6eb8ec1fe Adds a toggle so ghosts can hear radio chatter more easily. 2015-03-03 13:26:45 +01:00
MrStonedOne 90e46f35bb Fixes irc alerts of adminhelps not showing the ckey
Also fixes irc alerts of new players having the source split up in the announcement messages
2015-03-03 04:05:08 -08:00
Swag McYolosteinen c2290c6c5c Merge pull request #7913 from phil235/NewPlants
Adds new plants to botany
2015-03-03 11:23:32 +01:00