Commit Graph

13049 Commits

Author SHA1 Message Date
silveryferret
786c21c66e Fixes build_path variable, tweaks required components for R-UST parts, adds supply packs for R-UST things 2017-07-29 05:26:07 -04:00
LorenLuke
31e90bfeed Adds Collapsible AM rifle. Createes new uplink entry (#3644)
* Adds Collapsible AM rifle, and adds case with parts and 5 shots to Uplink. Separates it and intended merc version, both costing default telecrystal amount. Does NOT make them antagonist type specific.

* Addresses review.

* Makes rifle case traitor/merc specific. Enables ability to have specific uplink items be available only for specific antags.
2017-07-28 16:06:20 -05:00
MagmaRam
ff557493bd Merge pull request #3631 from Anewbe/merc_heist_again
Readjusts merc and heist numbers
2017-07-28 15:24:06 -05:00
Anewbe
c51b33fef2 Adds more technomancer icons 2017-07-26 17:07:19 -05:00
MagmaRam
c14e33383a Merge pull request #3637 from Anewbe/ling_armor_runtime
Should fix a qdel warning runtime for ling armor
2017-07-25 17:04:39 -05:00
MagmaRam
86d5262c60 Merge pull request #3625 from Anewbe/mend_synthetic
Mend Synthetic actually repairs FBPs
2017-07-25 17:03:54 -05:00
Anewbe
31bc1f757f Merge pull request #3635 from LorenLuke/Bomb-Consistency
Tank/TTV Consistency improvement
2017-07-25 16:44:45 -05:00
Neerti
8dab8c1440 Merge pull request #3642 from SpadesNeil/thunderdome-camera
Makes Thunderdome camera indestructable.
2017-07-25 05:51:09 -04:00
Spades
07e907b1cc Makes Thunderdome camera indestructable.
Uses this code:
```
/obj/machinery/camera/ex_act(severity)
if(src.invuln)
return
```
2017-07-25 01:57:46 -04:00
Anewbe
aa18b610af Should fix a qdel warning runtime for ling armor 2017-07-24 13:51:58 -05:00
Anewbe
b22ce553cc Merge pull request #3632 from Neerti/7/23/2017_rip_trine
Fixes Autoantag Assigning to Invalid Mobs
2017-07-24 12:39:58 -05:00
Anewbe
686250d695 Merge pull request #3623 from Nalarac/Robot
Allows Click Dragging for Cryo and Cloner
2017-07-24 12:37:44 -05:00
LorenLuke
3a80ffa080 Fixes inconsistent behavior by TTVs and STBs. 2017-07-24 10:28:20 -07:00
Neerti
3268ebe769 Fixes Autoantag Assigning to Invalid Mobs
Uses a mob var to determine antag validity instead of typechecks, since I believe this will work out better in the long term.  Inheritance can automatically make new mobs we make be invalid by default.
2017-07-23 20:19:24 -04:00
Anewbe
461ea17531 Readjusts merc and heist numbers 2017-07-23 17:31:28 -05:00
Anewbe
a5114f99dd Embiggens the laundry baskets 2017-07-23 16:33:02 -05:00
Anewbe
a2f6bfc68e Mend Synthetic actually repairs FBPs 2017-07-23 14:04:13 -05:00
Anewbe
196212faee Merge pull request #3614 from silveryferret/Polaris-R-UST-Port
R-UST Port, now in Polaris flavor.
2017-07-23 11:25:24 -05:00
Andrew
89ed652d89 Allows Click Dragging for Cryo and Cloner
Patients can now be click dragged by themself or another into a
cryogenics pod or cloning scanner. This allows cyborgs to use this
equipment without external assistance.
2017-07-23 10:06:02 -05:00
Anewbe
91b06c20d1 Merge pull request #3622 from LorenLuke/tank-runtime-fix
Fixes a div/0.
2017-07-23 00:25:35 -05:00
LorenLuke
bc972c86e8 Fixes a div/0. 2017-07-22 22:05:45 -07:00
Anewbe
f7f6280d48 Fixes Overload 2017-07-22 18:55:13 -05:00
silveryferret
f6af2c7733 Fixes slight oversight during copypasting from Europa's R-UST code. 2017-07-21 23:29:31 -04:00
Spades
7e4417d31f It's CentCOM not CentCOMM
I swear to god I have fixed this like three times already and somehow it
keeps coming back.
2017-07-21 04:29:39 -04:00
silveryferret
7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04:00
Anewbe
7669c83dfa Merge pull request #3607 from LorenLuke/one-tank-bomb
Changes Single-Tank-Bomb behavior.
2017-07-19 14:01:36 -05:00
Cameron653
e158fcd3cc Macro Replacements. (#3574)
* A preface to my madness

Travis failed one of my PR's because I copied old code
that used /red /blue /green.

Because of this, I am going to find and replace every
instance of it that I find.

Also this is a test commit to make sure I'm comitting
to the correct branch.

* /blue /green /red replacements

Dear god.

A slow and painful death from acid is more fun than this.

I wouldn't wish this torture on my worst enemy.
And this is only the beginning

* Replace part 2.

Time to fix the human error.

* Fixes mismatches

* Sets macro count to 220

One above the current number of macros in the code.

* Fixes last of the mismatches.

* Removes spaces, replaces \black

Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen

* Updating macro count again

* More fixes!

* Issues fixed! For real this time!

I swear!

* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Belsima
a3319de4f4 Adds a load of lore-friendly drinks & adjusts existing descriptions. (#3588)
* adds a load of lore-friendly drinks

* changelog

* uncomments radioactive drinks

:(

* nuka cola comeback

* Fixes the pull request.

* Makes drinks a bit more powerful.
2017-07-18 22:28:35 -05:00
Anewbe
d7875f5377 Merge pull request #3609 from Belsima/legwarmers
Adds a load of zippos to the loadout.
2017-07-18 16:27:09 -05:00
Anewbe
2426bf7b0c Merge pull request #3605 from LorenLuke/IEC-TLC
Gives IECs some TLC
2017-07-18 16:23:35 -05:00
Anewbe
b22a9fa575 Merge pull request #3589 from Belsima/gloves
Adds fingerless gloves.
2017-07-17 15:42:28 -05:00
Belsima
a291ae9889 Adds a load of zippos to the loadout. 2017-07-17 14:57:14 -04:00
LorenLuke
b7f5362276 See https://github.com/Baystation12/Baystation12/pull/14404.
(ignore point 13)
2017-07-16 16:03:31 -07:00
LorenLuke
14ad0d70e3 See changelog. 2017-07-16 02:58:52 -07:00
Neerti
b7df8d0b90 Merge pull request #3602 from Anewbe/conversion_tweak
Lowers the hallucinations from the conversion rune
2017-07-16 04:26:45 -04:00
Neerti
3d327533e8 Merge pull request #3599 from Anewbe/electric_welders
Electric Welders can be charged properly
2017-07-15 20:45:31 -04:00
Anewbe
96890cad1b Lowers the hallucinations from the conversion rune 2017-07-15 16:15:08 -05:00
Anewbe
b220cf3c2f Merge pull request #3597 from PrismaticGynoid/intellicores
Replaces intelliCards with intelliCores.
2017-07-15 14:48:36 -05:00
Anewbe
5f5f415fa0 Adds cargo jobs to the ID console 2017-07-13 19:53:16 -05:00
Anewbe
7bf0fb7da8 Electric Welders can be charged properly 2017-07-13 17:50:20 -05:00
PrismaticGynoid
ad6e395ae2 Replaces intelliCards with intelliCores.
Sprites replaced with a black box that could conceivably contain a brain, while obscuring the details. Complete with screen and convenient handle.
Usage text modified to make sense for MMIs/posibrains, instead of just drone brains (e.g. downloaded → transferred).
Description added to the new intelliCores. Made into normal-sized item, similar to MMIs/posibrains.

This is an alternative to either changing lore to allow for brain uploading, or changing code to allow for choosing multiple AI brain types.
2017-07-13 00:14:34 -07:00
Belsima
e51de25dea Adds fingerless gloves. 2017-07-11 00:49:02 -04:00
Neerti
a47584fdb0 Merge pull request #3576 from Anewbe/medical_gowns
Adds medical gowns
2017-07-10 17:48:31 -04:00
Anewbe
c64f7c9fa3 Merge pull request #3505 from Dhaeleena/Somecat
Winter boots
2017-07-09 17:13:27 -05:00
Anewbe
be8c644e07 Merge pull request #3565 from Neerti/7/6/2017_jammers
Adds Radio Jammers to Traitor Uplink
2017-07-09 16:15:42 -05:00
Anewbe
3332584fc3 Merge pull request #3566 from Neerti/7/7/2017_removes_draft_dodging
Removes Forced Antag Draft
2017-07-09 16:11:38 -05:00
Anewbe
252f3af8ad Adds medical gowns 2017-07-09 15:03:11 -05:00
Anewbe
c1da073906 Merge pull request #3571 from SpadesNeil/tree-layer-fix
Fixes layering issue with tree icons
2017-07-09 14:06:46 -05:00
Anewbe
cf09e7f55c Merge pull request #3570 from Belsima/master
Enables unused cypherkey sprites.
2017-07-08 14:48:02 -05:00
Anewbe
128358e153 Merge pull request #3567 from Neerti/7/7/2017_communicator_ghost_sound
Communicator Ghost Message Sounds
2017-07-08 14:45:56 -05:00