Commit Graph

18764 Commits

Author SHA1 Message Date
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
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
Cheridan
95e269e211 Merge pull request #8122 from Xhuis/miners_messiah
Adds the ore satchel of holding
2015-03-06 15:15:40 -06:00
Cheridan
903d2fdb39 Merge pull request #8121 from Incoming5643/everything_I_code_never_works
Fixes pop cap messages not properly showing custom messages (with default config.txt)
2015-03-06 15:01:37 -06:00
Cheridan
377dd9f876 Merge pull request #8142 from phil235/girderfixes
Fixes many checks in construction from stacks,
2015-03-06 13:54:09 -06: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
Cheridan
0496dcd446 Merge pull request #8169 from dannno/morebarsigns
adds more barsigns
2015-03-06 13:35:13 -06:00
Cheridan
92a40fc470 Merge pull request #8126 from Iamgoofball/raginmages
fixes Ragin' Mages making only 1 mage
2015-03-06 13:04:48 -06: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
dannno
d1b1e9f05c changelog 2015-03-06 12:49:08 -05:00
Cheridan
7c960c6101 Merge pull request #8163 from Jordie0608/hiorangeshowareyou
Changelog compiled and instructions edit
2015-03-06 11:25:57 -06:00
Cheridan
2940de38d4 Merge pull request #8108 from TheVekter/vodkasprite
Fixes the broken Badminka Vodka sprite
2015-03-06 10:53:45 -06:00
Nienhaus
8d2f021def Merge pull request #8098 from pudl/fire
resprites fire extinguishers
2015-03-06 10:04:10 -06:00
Cheridan
6b512f663a Merge pull request #8137 from Incoming5643/so_misunderstood
Removes the Spooky
2015-03-06 00:09:25 -06:00
Cheridan
d56cb89407 Merge pull request #8076 from xxalpha/lighters
Grayscale Lighters
2015-03-06 00:00:51 -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
6b633c35d2 Merge pull request #8145 from Incoming5643/dangit_bobby_its_all_ones_and_zeros
Hotfix for Blob mulligan rounds not ending | Nuke codes being given in times of peace | AI desiring to blow up the station
2015-03-05 23:33:42 -06:00
Cheridan
8fa6b3edea Merge pull request #8140 from phil235/doughbeakerfix
Improvised heating fixes
2015-03-05 22:58:44 -06: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
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
dannno
354f59f10c adds more barsigns 2015-03-05 14:06:44 -05:00
Swag McYolosteinen
a341fd72b0 Merge pull request #8065 from paprka/squiddeath
Rebalances thermals
2015-03-05 19:14:57 +01:00
Swag McYolosteinen
daa6fa89d0 Merge pull request #8014 from paprka/altclick2
Alt click for PDAs
2015-03-05 19:13:07 +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
WJohn
1c55a568f2 Merge pull request #8075 from Xhuis/the_coderbus
Adds the Coderbus and Adminbus bar signs: No merge conflicts edition
2015-03-05 13:08:33 -05: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
Swag McYolosteinen
652bac070b Merge pull request #8156 from Mandurrrh/trailsbugfix
Fixes #8116 trails bug
2015-03-05 19:00:39 +01:00
Jordie0608
6c389787bd rogue or 2015-03-05 20:29:43 +11:00
Jordie0608
500a030a8d Edited example yml for only double quotes 2015-03-05 20:28:03 +11:00
Jordie0608
cc052cb22d Changelog compiled 2015-03-05 20:24:42 +11:00
Jordie0608
9fcb7ad02c Taser changelog and spellfix 2015-03-05 20:21:23 +11: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
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
Mandurrrh
48daa155d7 Fixes #8116 trails bug 2015-03-04 19:53:11 -05:00
Cheridan
e2554c55e6 Merge pull request #8147 from Cheridan/master
Manual Merge of #7607
2015-03-04 00:39:34 -06:00
Cheridan
de7371dae5 Merge branch 'RemieRichards-BlobReroll' 2015-03-04 00:34:15 -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
aa8565ff9f Merge pull request #8106 from Ikarrus/preserveobjectives
Preserve Objectives when admins remove antag status
2015-03-04 00:13:23 -06:00
Cheridan
3fd821bdd7 Merge pull request #7986 from phil235/TaserJitterFix
Fixes taser stun duration
2015-03-04 00:01:49 -06:00
Cheridan
fab9e9c9e4 Merge pull request #8125 from Ikarrus/assistantspawns
[Map] Shuffles Assistant Spawn Locations
2015-03-03 23:15:02 -06:00
Cheridan
39cccb82e4 Merge pull request #8123 from Ikarrus/randomspawns
Randomizes Order of Job Spawn Points
2015-03-03 22:57:16 -06:00
Cheridan
94e2925df3 Merge pull request #7449 from RemieRichards/NecromanticStone
Adds a Necromancy Stone
2015-03-03 22:37:38 -06:00
phil235
12d677a97b Fixes HydroTray Lights sprites. 2015-03-04 02:08:34 +01:00
Incoming
83cb66e3a3 Prevents centcom from sending the nuke code to a station that already defeated the blob (because you know they'd still blow themselves up) 2015-03-03 19:49:36 -05:00
Incoming
44d30afd20 Hotfix for Blob mulligan rounds. WHOOOOOPS 2015-03-03 19:42:01 -05:00
phil235
f5279273f1 Fixes many checks in construction from stacks, so you can no longer build two girders on top of each other for example. 2015-03-03 23:43:17 +01: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