Commit Graph

286 Commits

Author SHA1 Message Date
KorPhaeron c2bc05a799 Reinforcements for nuke ops 2015-12-17 06:54:21 -06:00
oranges 134a76cc8f Line ending apocalypse 2015-12-17 14:12:37 +13:00
KorPhaeron f06d69ef5e A bit more telecrystals 2015-12-15 16:02:58 -06:00
KorPhaeron a6194f4725 Adds an optional challenge mode to nuclear operatives 2015-12-14 05:40:19 -06:00
as334 dc98e67f05 Just fuck my shit up fam 2015-11-29 13:48:58 -05:00
Jordie da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
as334 611fb49c1c Wake me up inside 2015-11-29 00:58:30 -05:00
Tkdrg bec0d04e98 Nukes will no longer lock the MC sometimes
Fixes #3956
Also updates CONTRIBUTING.md on the newline policy.
2015-11-27 00:25:08 -03:00
Firecage c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
as334 d97dffaf57 unfucking shit ass plasma memes part 3 2015-11-18 20:58:05 -05:00
as334 c98a7a0d7e Fixes merge conflicts, also a minor slipup with flags 2015-11-17 20:59:43 -05:00
as334 160506b401 Unfucking shit ass plasma memes part 2 2015-11-17 20:38:56 -05:00
Razharas 62cd83fa30 Merge pull request #12778 from AnturK/minor_upgrades
Mech Speech Bubbles, POI list for Observe
2015-11-15 09:07:21 +03:00
Tkdrg e2187614fd Merge remote-tracking branch 'upstream/master' into hog-mergeconflicts
Conflicts:
	code/__DEFINES/hud.dm
	code/__HELPERS/game.dm
	code/_onclick/hud/_defines.dm
	code/_onclick/hud/hud.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/game_mode.dm
	code/game/machinery/turrets.dm
	code/modules/client/preferences_toggles.dm
	code/modules/events/alien_infestation.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	icons/mob/back.dmi
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/inhands/items_lefthand.dmi
	icons/mob/inhands/items_righthand.dmi
	icons/mob/mob.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/items.dmi
	icons/obj/projectiles.dmi
	icons/obj/storage.dmi
2015-11-02 01:06:30 -03:00
AnturK a7334f95b6 Adds POI List, makes orbit use it. 2015-10-31 20:02:06 +01:00
MrPerson 73c0f5d462 Remove tags from some maps
Disc was left completely untouched. Dream was given only a single edit to keep the syndiebomb working. Meta and Bird are also both cleaned up now too. All map-specific custom z's were cleaned too.

Source of these tags is DM being stupid. When you use the "Generate instances based on icon states" option, for some ungodly reason it gives those instances a tag. Which is retarded, tags are supposed to be unique to each object.

I tried searching for legit uses of tag in code and found only a few landmarks and giving mobs a tag. In any event, setting tags on map objects is probably a really bad idea anyway.

Exact regex used to find these so you guys can check my work

; tag = "[^"]*"
#end/middle

(?<=\{)tag = "[^"]*";
#begin

\{tag = "[^"]*"\}
#solo
2015-10-24 09:07:32 -07:00
Jordie0608 1dee35a5f9 syndie nuke and closet mapped to shuttle 2015-10-21 18:27:29 +11:00
Remie Richards 68a3d0bd29 Merge pull request #12086 from AnturK/loneop
Nukeop Outfits,Uplink gamemode override, Lone Operative event.
2015-10-13 23:02:51 +01:00
KorPhaeron 31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Remie Richards b9394257da About a million changes, but largely: Functional (Sort of) Antag Huds, Mind fixes, and Final glue to get the mode working. 2015-10-07 22:11:19 +01:00
AnturK fde2d23e12 Changes lone op tc 2015-10-05 12:14:18 +02:00
AnturK b173004231 Nukeop Outfits 2015-10-05 12:13:37 +02:00
Xhuis 1b59be64ff More fixes, adds self to admins.txt 2015-09-28 17:52:33 -04:00
phil235 6ee5ab6680 Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/admin/verbs/one_click_antag.dm
2015-09-19 22:34:30 +02:00
phil235 f90ee4aa8c - Fixed monkey starting with no dna.
- Fixed bugs with monkeyize/humanize: 7803 (humanized monkey nobloodtype)
- Fixes 9298 monkeyed ling have troubles humanizing themself (already fixed?)
- Fixes despawning clothes when monkeyizing. 11855
- Replaced check_dna_integrity proc by simpler has_dna proc when required.
- created set_species() proc
- fixed space retrovirus not transfering SE (despite having a domutcheck()). Still need to check if it needs a name = real_name.
- I renamed mecha/var/dna to dna_lock to avoid confusion
- I renamed an armor var in a species proc to armor_block to avoid confusion with species/var/armor.
- I removed many if(dna) checks in lots of files.
- I removed duplicate defense procs between human/proc/X and dna.species/proc/X since dna is now always set.
- Anatomic panacea from changeling removes alien embryo correctly. 6247
- Fixes runtime when trying to put dna-less brain mmi into a dnalocked mech.
- Removed carbon/var/list/features, we now only have dna.features and prefs.features
- Remove hulk mutation from lizards and other species (Fixed 6413); only real humans can acquire hulk. (less work on sprites for each ones, fixes lizard tail not in hulk color)
- Fixes cloning not setting up correctly dna UE and dna.real_name
- I fixed the issue with sucked+cloned ling being unable to absorb
- I fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- I added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.

- Fixes cloning not setting up correctly dna UE and dna.real_name
- Fixed the issue with sucked+cloned ling being unable to absorb
- Fixed issue with changeling proc checking if they have the dna already not working.
- Fixed 4095, low health hulk with DAA getting stuck in loop of acquiring/losing hulk.
- Added a second layer for mutations to differientate mutations that go below and above the body layer (Fixes 7858)
- Fixes 10048, the transform to initial appearence button was fucking up the dna.
2015-09-19 22:18:28 +02:00
xxalpha 4d4b8e64c1 Merge remote-tracking branch 'upstream/master' into n_u_c_l_e_a_r
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-09-16 23:14:14 +01:00
bear1ake f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
xxalpha 1fbed2c7e6 Changed Vault circuit grid floors to bluegrid. 2015-09-06 22:57:45 +01:00
xxalpha 51934abbc8 Reworked nuke deconstruction. New nuke sprites. More++
Changelog
2015-09-06 21:35:14 +01:00
Razharas 5bf8c9dae5 Merge pull request #11512 from Jordie0608/thefirststeptoanyunificationisnaturallystatistics
Makes auto_declare_completion_ use printplayer()
2015-09-01 18:34:27 +03:00
Jordie0608 84a373ad90 makes auto_declare_completion_ use printplayer() 2015-08-31 20:55:12 +10:00
duncathan 51c09f16bf makes all Destroy()'s return properly 2015-08-31 00:21:01 -06:00
c0 04f7b3f2de Surgery, Implants and Organs rework: Phase 1 2015-07-31 22:18:31 +03:00
MrPerson 471d69fcf7 Change many ERROR() calls into thrown exceptions
This requires a 508 beta version to use. If Travis fails this he's a bitch

Exceptions will generate a stack trace, which is way easier to see and more helpful in actually solving this kind of crap. Also logs all the arguments, src, line, and file automatically.
Removed any dubiously helpful information in the exception names so the runtime condenser won't see each one as a different runtime. If the information is critical to solve these bugs (camera one maybe?), then I'll just make these warnings.
Thrown exceptions crash the currently running proc. Yes that means there's useless returns in a bunch of these, sue me. spawn()'s are to let the proc continue.

Almost all of these are difficult to trigger, but I did test playsound. And frankly even if they do cause bugs by crashing procs, big whoop
2015-07-23 08:19:08 -07:00
phil235 3a93eeabba Merge branch 'master' of https://github.com/tgstation/-tg-station into DrinkingGlassPourFix
Conflicts:
	code/game/jobs/job/cargo_service.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/job.dm
2015-07-16 14:19:29 +02:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235 ce101208a9 Fixes Satchel preference not working.
Also some simplification of the equip_backpack() proc.
2015-07-15 17:38:03 +02:00
Cheridan f9357c22d2 Merge pull request #10409 from xxalpha/hurr
Added error message to nuke's deconstruction for clarity.
2015-07-07 07:00:19 -05:00
Ikarrus 5e50b2b982 Update and Changelog
Lizard names are now "name1-name2"
2015-07-05 22:20:00 -06:00
Ikarrus b0cfaf401f Random Names for Lizards
Lizards now have their own list of names to pull from when randomizing their names.
2015-07-05 18:35:56 -06:00
xxalpha 12aceebc54 Added error message to nuke's deconstruction for clarity. 2015-07-05 14:40:24 +01:00
xxalpha 4a86be4883 Merge remote-tracking branch 'upstream/master' into boxesofbananium
Conflicts:
	code/game/objects/items/stacks/sheets/mineral.dm
2015-07-02 18:49:41 +01:00
Jordie0608 3b33a3da9f Merge branch 'master' of https://github.com/tgstation/-tg-station into ss13countsasaweaponofmassfrustration
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	icons/obj/machines/bignuke.dmi
2015-07-01 19:41:00 +10:00
Jordie be391f52ff Merge pull request #9840 from xxalpha/niggastolemynuke
New traitor objective: Nuke Heist
2015-07-01 18:58:00 +10:00
xxalpha cfb5e724b6 Material container, all items can have materials, wake me up
cant wake up

go to sleep debug
2015-07-01 03:34:47 +01:00
Razharas 97aaa5fb8d Revert "Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs onc…" 2015-06-26 02:44:20 +03:00
Razharas 69d6cd4f94 Revert "Microbombs and Macrobombs, Nuke Ops start with Microbombs once more" 2015-06-26 02:16:02 +03:00
xxalpha c4c00f8f80 All nukes can now be deconstructed. 2015-06-24 15:23:44 +01:00
Iamgoofball ab36f89844 NUKE OPS START WITH MICROBOMBS NOW, nerfs microbombs because I made them way too powerful and 20 of them was actually double the bombcap 2015-06-23 21:37:21 -07:00