Commit Graph

25913 Commits

Author SHA1 Message Date
Anewbe
a2f6bfc68e Mend Synthetic actually repairs FBPs 2017-07-23 14:04:13 -05:00
Cyantime
2626a95c74 Replaces hearer()/viewers() checks with get_mobs_and_objs_in_view_fast() in AI holopad transmission 2017-07-23 14:03:55 -04:00
MagmaRam
9055ac6e1e Merge pull request #3600 from Anewbe/scrubs
Gives medical scrubs sleeves, that can be rolled down.
2017-07-23 11:34:21 -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
Cameron653
5356b54b60 Update miscellaneous.dm 2017-07-22 21:49:23 -04:00
Anewbe
f7f6280d48 Fixes Overload 2017-07-22 18:55:13 -05:00
silveryferret
d9526bde2c Puts initial_fire_delay and burst_delay into variables instead of hardcoded numbers, as requested. 2017-07-22 17:24:08 -04:00
Anewbe
f0d9bb5dce Adds the weapon swaps to the uplink 2017-07-22 15:01:18 -05:00
Anewbe
ab5e716624 Merge pull request #3617 from SpadesNeil/centcom-not-centcomm
CentCom not centcomm
2017-07-22 13:30:06 -05:00
silveryferret
af7fe828d8 Removes more unneeded gas_fuel defines/references, adds XGM_GAS_FUSION_FUEL flag to phoron 2017-07-21 23:47:53 -04:00
silveryferret
a507d54e28 Removes GAS_FUEL define, since it's not needed 2017-07-21 23:32:16 -04: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
Anewbe
45b789ebbf Merge pull request #3613 from SpadesNeil/5.56-to-5.45-take-two
Changes 5.56mm to 5.45mm, now 20% less stupid
2017-07-20 15:33:38 -05:00
silveryferret
ad5cfd0087 Fixes Chemistry-Recipes.dm.
Not 100% sure how this happened, mergetool must've screwed up somehow.
2017-07-19 23:22:36 -04:00
silveryferret
3d3ff303c7 Adds missed Oxyphoron reaction, moves Deuterium/fifty into obj/fiftyspawner/deuterium 2017-07-19 23:14:15 -04:00
PrismaticGynoid
34f9e11d76 Voice mobs in communicators can now understand speech they hear from mobs that have no default language set - in other words, all silicon mobs - as well as speech not attached to a mob, such as from the Arrivals Announcement Computer. 2017-07-19 19:27:07 -07: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
Spades
2e776ac645 Changes 5.56mm to 5.45mm, now 20% less stupid
The same as https://github.com/PolarisSS13/Polaris/pull/3612 except this
time I'm not a dumbass and accidentally overwriting other changes
because the Github client decided not to sync with Polaris.
2017-07-19 14:24:50 -04:00
Anewbe
4f40e49e9f Merge pull request #3611 from Belsima/vests
Makes blob light green and dim.
2017-07-19 12:49:06 -05:00
Anewbe
03df7a1eab Merge pull request #3608 from SpadesNeil/xenomeat-returns
Changes Spider meat back to Xeno meat
2017-07-19 12:47: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
3047b9285c Changes blob core lighting. 2017-07-19 10:08:57 -04: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
14fb294e79 Merge pull request #3610 from Atermonera/Observer_icons
Adds various animal sprites to ghost icons
2017-07-18 20:20:02 -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
Belsima
d33132b0ad Makes blob light green and dim. 2017-07-18 12:12:03 -04:00
Atermonera
f334fbe3a2 Fucking commas 2017-07-17 17:02:02 -07:00
Atermonera
cd8b89d249 Adds various animal sprites to available ghost sprites 2017-07-17 16:40:54 -07: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
Spades
350fa74c14 Changes Spider meat back to Xeno meat
But also changes a bad design choice and makes spider meat a viable
alternative to recipes requiring Xeno meat.

Now, for those of us who do still use xenos for things, xeno meat isn't
suddenly completely useless, while spiders still produce their own
unique meat that is usable in these recipes.
2017-07-17 04:45:40 -04:00
LorenLuke
b7f5362276 See https://github.com/Baystation12/Baystation12/pull/14404.
(ignore point 13)
2017-07-16 16:03:31 -07:00
LorenLuke
cfb233aa1b Fixes travis. 2017-07-16 12:19:35 -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
1f4e2d4a5b Caps the negative effects of the high-end drugs 2017-07-15 19:22:59 -05: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
Neerti
2780d3745d Merge pull request #3601 from Anewbe/hop_console
Adds cargo jobs to the ID console
2017-07-14 23:38:54 -04:00
Belsima
29d0442f76 Adds a buncha robot sprites. (#3585)
* Adds a buncha robot sprites.

* Adds a changelog for the robot sprites.

* i missed a comma :(

* at least im not the only failure

* fixes inconsistent NOBLE arms
2017-07-14 14:52:48 -05:00
PrismaticGynoid
7bc811fec0 Also changes the wipe_core verb. 2017-07-14 11:23:41 -07:00
Belsima
9167c121be Adds a corgi, bird, and more sprites to the pAI. (#3592)
* Adds a corgi sprite to the pAI.

* adds more pAI sprites

* commas are hell
2017-07-13 23:42:55 -05:00
Anewbe
5f5f415fa0 Adds cargo jobs to the ID console 2017-07-13 19:53:16 -05:00