Commit Graph

51 Commits

Author SHA1 Message Date
duncathan salt 454d16fe32 Minor refactor of how gas IDs are handled (#31528)
* gas IDs -> gas datum paths

* updates parse_gas_string() to handle both paths and IDs

* fixes compile errors

* fixes parse_gas_string() ignoring amounts of gas

* fixes roundstart jetpack runtimes

* fixes filters

* fixes map-edited filters

* fixes empty canister runtimes on initialization
2017-10-11 15:04:12 -04:00
Joan Lung e83d72219d Soft crit, except not terrible (#30262)
* Soft crit, except a little bit harder.

* tweak

* 👌

* why was this even in here

* no radios in critical

* fix that too

* keep to original logic

* not very smart, really

* tip: do nothing tgui-side that you can do code-side, because we can't do defines in tgui

* blood trail

* can't do blood trails

* how does this even work

* harsher slowdown and more obscured vision

* it really puts it into perspective; you're fucking dying.

* stat_attack

* stop fuckin whispering into radios or whatever it is you're doing

* more fixes

* fix

* fix

* fix the radio shit

* bikeshed?
2017-09-04 18:58:34 -05:00
pubby 6eb61d6f41 Crew monitoring rework part 1: crew pinpointers (#30117)
* Pinpointer refactor + Crew pinpointers

* Icon update

* Add crew pinpointers to maps, closets, and fix

* Fix defines

* Cyberboss fixes + add to warden and CMO

* More Cyberboss fixes
2017-08-30 18:02:28 -04:00
Jordan Brown b208a51975 Fixes supermatter sliver objective being given if there is no supermatter engine (#30032)
* Adds /engine variants of supermatter_shard

* Makes maps use /engine supermatter_shard variants

* Adds a framework for ensuring an objective_item exists before giving it as a target

* Fixes supermatter sliver objective being given with no supermatter engine on the map

* Works around BYOND stupidity
2017-08-24 11:39:35 +12:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03:00
Xhuis 6d453c8e82 now it compiles 2017-07-29 12:37:42 -04:00
Xhuis 6b22f606cd it's not modularrrrrrrr 2017-07-29 12:36:41 -04:00
Xhuis bb39d3f8ea Removes a rogue period from the sliver theft obj. 2017-07-29 11:49:53 -04:00
bgobandit 5bc348c366 Adds traitor steal objective: the Supermatter Sliver. (Fixed) (#27913)
* Adds a new steal objective, the Supermatter Sliver.

* actually commits theft_tools honke

* i actually dk what this is

* fixes v1

* Supersmatter sliver requested changes

* you know what I fucking hate is unchecking shit

* please does this fix it fucking dme clown shit

* placates the cyberboss and the lziard

* fucking clownery

* I forgot to fucking check it

* Hope this fixes it

* will my children inherit this PR

* reeeeeeeeeeeeeeee

* Let's put this horse to rest now....
2017-06-17 22:32:38 -04:00
Expletive 8413960d8e A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals) (#28115) 2017-06-06 22:26:56 -03:00
phil235 b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
Joan Lung b5b4037e2e More istypes replaced with helpers (#20767)
* shouldn't you be merging these by now

* my oh my do we have a lot of these

* a fellow pedantic shit
2016-10-03 13:40:13 +13:00
Bjorn Neergaard 4089d850cc Address feedback
Canisters mixtures can no longer be null thanks to accepting
one in New()

Just forget assert_gas in objectives
2016-02-10 23:42:15 -06:00
Bjorn Neergaard 481bc67ae6 Fix objective runtime
When reading fromg gases you must assert_gas

The following runtime has occured 59 time(s).
runtime error: cannot read from list
proc name: check special completion (/datum/objective_item/steal/plasma/check_special_completion)
  source file: objective_items.dm,97
  usr: null
  src: 28 moles of plasma (full tank) (/datum/objective_item/steal/plasma)
2016-02-09 23:00:57 -06:00
duncathan 17f167bcb7 associative list 2015-12-29 13:33:12 -06:00
duncathan b18cb5fca8 making shit compile 2015-12-28 08:31:20 -06:00
KorPhaeron 2609adb29d Blocking overhaul 2015-11-30 16:22:31 -06:00
Cheridan ea42f2d43f Merge pull request #12780 from AnturK/nukekitfix
Fixes one nuke kit per round.
2015-11-02 19:15:59 -06:00
AnturK 331d8d9acd Fixes one nuke kit per round. 2015-10-31 20:57:49 +01:00
Firecage d040083bf5 Adds the captains jetpack, both as an item and the new objective. 2015-10-27 17:34:27 +02:00
Firecage fc7ec2caf3 Changes jetpack objective 2015-10-27 15:13:46 +02:00
Tkdrg 7fc81c0ea4 Fixes extra checks for objectives
Fixes #4725
Reopens #11444 @Dorsisdwarf
@Cheridan please.
2015-10-25 02:57:07 -03:00
Iamgoofball 080882cb0d Makes the steal the plutonium core objective inform you that it is radioactive. 2015-07-27 19:29:30 -07:00
Firecage 4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Swag McYolosteinen d826a19f81 Merge pull request #9934 from nukeop/rcd
Makes RCDs more useful
2015-07-08 16:03:31 +02:00
Jordie be391f52ff Merge pull request #9840 from xxalpha/niggastolemynuke
New traitor objective: Nuke Heist
2015-07-01 18:58:00 +10:00
Barack Obama aa8305f814 remove rcd from traitor objectives 2015-06-18 10:50:17 +01:00
Ikarrus e255cd7663 Removes Corgi Meat as a possible steal objective
It's stupid and excessively silly.
2015-06-17 20:37:44 -06:00
xxalpha 41feb1d911 Defined nuke state values. Tweaked core's process() and others. 2015-06-08 01:06:11 +01:00
xxalpha 209bc10caa Several changes and additions: Added ability to steal a nuke. 2015-06-07 20:03:39 +01:00
Firecage 3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
phil235 493c3e038a Splitting food.dmi into smaller files.
Repathing meat slab, meatsteaks and cutlets into meat/slab, meat/steak, meat/rawcutlet, meat/cutlet. Fixes issue with food naming when containing meat stuff, especially human meat.
Bowl filled with reagent now gets a nice half transparent overlay with the reagents colors (like beaker)
Mousedroping a snack that's on a table now opens the tablecrafting window.
Fixes not being to store items in plain bread, plain cake and cheesewheel.
2015-04-03 21:59:56 +02:00
Steelpoint 79857b0eac InitalCommit 2015-03-09 17:02:34 +08:00
Steelpoint 940601bcfa Merge branch 'master' of https://github.com/tgstation/-tg-station into HoSGun
Conflicts:
	icons/obj/guns/energy.dmi
2015-02-13 01:14:52 +08:00
paprka 862b0d97bb removes defib objective 2015-02-08 17:12:00 -08:00
paprka 3e61bba236 defib changes 2015-02-08 17:06:34 -08:00
Steelpoint e20543eb25 AntagObjective+ChangelogUpdatedToAccount 2015-01-30 22:08:40 +08:00
Cuboos 8175bd91e0 Mining sound revamp, using realistic sounds now instead of reusing sound. Plus improved Taser sound. 2014-12-09 19:38:49 -08:00
paprka 549e87df0c adds traitor objective for defib 2014-10-31 09:16:19 -07:00
Cheridan 84e7121903 Adds construction permits 2014-10-11 17:39:27 -05:00
paprka 1bb6603ff4 replaces a lot of inaprov syringes with medipens 2014-10-04 22:03:09 -07:00
paprka 644b702311 period 2014-07-21 00:11:31 -07:00
Firecage 750652bcf6 Improves objective text 2014-07-17 19:06:10 +02:00
ikarrus 58b2ff1671 -Removed some duplicate code
-Made the syndicate document names appear like codenames
2014-05-04 16:18:48 -06:00
ikarrus 82639d14a6 Secret Document Objectives
Adds new steal objective "Secret Documents"
-A set of secret documents spawn in the vault's filing cabinet, but even syndicate documents qualify as valid steals

Adds the exchange objective for traitors
-If there are at least 6 traitors, two of them will be selected to make an exchange of secret documents
-There is a low (20%) chance that one of them will have an additional backstab objective, where they will require both sets of documents to win
2014-05-04 15:00:47 -06:00
GunHog 23d39a296a Switches magboot target to the CE's boots. 2014-04-12 13:48:51 -05:00
Mloc-Hibernia 8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
Razharas b27d9c7396 Added RPED, some sprites and new power cell path
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
2014-02-24 05:14:43 +04:00
Cheridan 9f33690114 Gets rid of a couple colons. 2014-01-29 16:01:55 -06:00
Cheridan 6bdcf64525 Completes code changes; reimplements ninja steal objective. 2014-01-29 12:28:15 -06:00