e5ba67ed0b
makes code significantly less shit
2016-03-24 12:12:51 -05:00
860d51f090
touches up mentorhelps
2016-03-23 14:24:39 -05:00
fee5324f33
mentorhelp
2016-03-23 10:44:24 -05:00
b52e8cb847
Merge pull request #16213 from AnturK/buildmode_fix
...
Fixes buildmode dir
2016-03-21 03:16:31 -05:00
3bd3ff20ec
adds a couple of naughty missing periods
...
@cheridan uuuu
2016-03-19 23:11:51 -07:00
a9b7a27a44
Fixes buildmode dir
2016-03-19 12:36:15 +01:00
35bfb9abb6
Merge pull request #16073 from KorPhaeron/humans
...
Plasmamen fixes
2016-03-16 17:48:29 +01:00
da8baeaab8
Human fixes
2016-03-15 12:29:35 -05:00
cdfce3046e
Removes cap on bomb cap
2016-03-15 03:39:43 -07:00
71ae9d13aa
Adds lag checks to massedit, sdql2, del-all, and the map loader
2016-03-15 03:39:42 -07:00
942f0e309e
Plasamen fixes
2016-03-12 20:29:10 -06:00
cc034af9d4
Merge pull request #15999 from ChangelingRain/placesplease
...
Goon-style blob placement
2016-03-12 21:17:57 +01:00
d1f8562c04
Merge pull request #16043 from Jordie0608/ifitwasneverusedisitreallybroken
...
Fixes broken regex
2016-03-12 13:55:20 -06:00
af0575cf8b
Merge pull request #16016 from KorPhaeron/communications
...
Responding to a centcomm message resets the machines cooldown
2016-03-11 11:58:17 -06:00
5ee92abad3
fixes broken regex
2016-03-11 21:43:32 +11:00
12a6205372
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomRuins/SpaceRuins/asteroid4.dmm
_maps/RandomRuins/SpaceRuins/spacebar.dmm
_maps/RandomZLevels/Academy.dmm
_maps/RandomZLevels/beach.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/spacebattle.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/RandomZLevels/wildwest.dmm
_maps/map_files/AsteroidStation/AsteroidStation.dmm
_maps/map_files/BirdStation/BirdStation.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/DreamStation/z5.dmm
_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
_maps/map_files/MetaStation/MetaStation.v41I.dmm
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/TgStation/tgstation.2.1.3.dmm
_maps/map_files/generic/z4.dmm
_maps/map_files/generic/z5.dmm
_maps/map_files/generic/z6.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
_maps/templates/lavaland_surface_ufo_crash.dmm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/machinery/computer/arcade.dm
code/game/objects/structures/lattice.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/misc_floor.dm
code/game/turfs/simulated/floor/plasteel_floor.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/bot/cleanbot.dm
code/modules/mob/living/simple_animal/bot/mulebot.dm
code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
1f177d3ab2
Communications
2016-03-09 22:42:03 -06:00
1ead1acbfc
Goon-style blob placement
2016-03-09 20:21:19 -05:00
3a6a038322
Merge pull request #15945 from Shadowlight213/Snpcbuttonmove
...
Moves SNPC admin buttons to the debug tab
2016-03-08 18:38:48 +11:00
a5bcdb086a
Merge pull request #15924 from lordpidey/adminantaghud
...
Adds admin antag-hud
2016-03-07 17:42:22 -05:00
b5c398a252
Moves SNPC admin buttons to the debug tab
2016-03-05 19:05:54 -08:00
daf13e0f19
Now works with gangs too (provided the gang was created BEFORE antaghud was turned on)
2016-03-05 15:00:29 -05:00
3aabb070d8
SNPC Update v4: ;HELP I'M BEING BEATEN TO DEATH BY GIBBERING ROBOTS
...
* Updates the CustomiseSNPC verb to be less laggy
* Adds a resetSNPC verb to manually reset one.
* Adds a toggleSNPC verb to change between high and low profile mods
* Added a "High Profile" processing mode that can allow the SNPC to tick at custom rates, for special/story SNPCs
* All SNPCs now spawn as Assistants to prevent head spam.
* SNPCs can now be spawned as a doppelganger, and will take the name of a person with the same job as them.
* SNPCs now only hack doors their job doesn't have access to.
* SNPC augmentation values tweaked
* Runtime caused by limbs fixed
* Runtime caused by assigned the SNPC to be a chef fixed.
* Bartender SNPCs now receive a module which allows them to serve drinks to nearby patrons.
* Fixed Chef SNPCs having incorrect modules and home areas.
* Certain modules will now skip being processed if combat is taking precidence.
* Fixed an incorrect emote.
* Clown SNPCs will now drop less items (to prevent massive piles of soap or bananas)
* SNPCs using the healing module will now try to use stackable healing items, and if they are out, instead use their inbuilt tricordrazine hypospray.
* Janitor SNPCs no longer attempt to mop things, and instead use an inbuilt space-cleaner spray
* Chef SNPCs will no longer leave behind uncooked food when trying to process it.
* Chef SNPCs will now use the smartfridge as a source to make custom food.
* Chef SNPCs will no longer run amok, spraying food everywhere.
* Chef SNPCs will attempt to serve up completed food to the Chef's window
* If a Chef SNPC cannot find any viable food source, they will synthesize clones of regular food, which have a lower nutriment count than the real ones.
* SNPCs will no longer explode into items when entering combat, and will no longer throw guns instead of shooting them.
2016-03-04 21:14:02 +11:00
a932be993f
SNPC verb hotfix
2016-03-02 22:05:23 +11:00
ffb14ed84d
Merge pull request #15788 from Shadowlight213/Oldcultredo
...
Remake of #15690 . Replaces newcult with oldcult.
2016-03-01 22:37:58 -06:00
cd20e5ec4b
Merge pull request #15815 from Shadowlight213/Commandnamechange
...
Adds admin button to change central command's name.
2016-02-29 15:09:27 -06:00
dc9e446507
Merge pull request #15795 from Menshin/forcefield_cleaning
...
Cleaning of singularity fields code
2016-02-28 23:17:58 -03:00
98190462c0
Fixes
2016-02-28 00:21:23 -08:00
c895016caa
Adds admin button to change central command's name.
2016-02-27 23:38:21 -08:00
84566ef751
Merge pull request #15773 from AnturK/template_fix
...
Fixes uploaded templates size preview
2016-02-27 21:40:22 -03:00
77b7f02bdd
Merge pull request #15775 from AnturK/fix1
...
Bunch of fixes
2016-02-27 21:27:08 -03:00
96e842b24c
Merge pull request #15737 from lzimann/ctfbutton
...
Adds a way to quickly enable/disable CTF for admins.
2016-02-27 19:11:48 -05:00
KiwiFarms
7374902800
* Cleaning field generator code
...
* Fixes runtimes on field shutdown
2016-02-27 22:44:17 +01:00
642321b5cd
Removes newcult and readds oldcult
2016-02-27 00:53:14 -08:00
cd549bb33b
Fixes wrong irc message
2016-02-26 21:29:13 -03:00
9b43816de5
Fixes check antagonists formatting for revolution
2016-02-26 21:33:05 +01:00
19e188322c
Fixes uploaded templates.
2016-02-26 17:41:30 +01:00
45fca87806
Merge pull request #15687 from AnturK/template_improvements
...
Template loading improvements
2016-02-25 16:29:10 -03:00
ec90073b1d
Add two lines
...
Oops.
2016-02-24 21:33:23 -03:00
89610b10fb
Adds a way to quickly enable/disable CTF for admins.
2016-02-24 21:27:10 -03:00
e22dddb50a
Minor Improvements
2016-02-23 21:44:21 +01:00
d282727fd5
Fixes mass modify for file type.
2016-02-22 22:42:41 +01:00
4e0db5664b
Adds /turf/template_noop and /area/template_noop to dmm reader
2016-02-22 19:24:45 +01:00
07432da284
Fixes off-by-one errors.
...
Adds template area preview
2016-02-22 19:09:31 +01:00
9766395322
Merge pull request #15355 from tkdrg/yeah
...
Improves admin counting for irc
2016-02-22 01:27:43 -06:00
8109c83033
Merge pull request #15643 from tkdrg/old
...
VV path edit will now use spawn-style dialogs
2016-02-21 20:12:20 -05:00
ceb9af945c
Removes typo.
...
Makes Load Template verb get turf after input.
2016-02-20 18:12:20 +01:00
6563543b5f
VV path edit will now use spawn-style dialogs
2016-02-20 12:09:16 -03:00
77ee2ded62
Renames click intercept method to avoid collision with ClickOn
2016-02-20 15:39:14 +01:00
bawhoppen
Lularian
KorPhaeron
PKPenguin321
AnturK
AnturK
KorPhaeron
MrStonedOne
duncathan salt
Cheridan
Jordie0608
Nerd Lord
Shadowlight213
Mike Long
Sawu
tkdrg
KiwiFarms
Leo
Lzimann