Commit Graph

1485 Commits

Author SHA1 Message Date
Cameron653
4befc0dede ))))))))))))))))))))))))))))))))))))))))))))))) 2017-09-10 22:13:34 -04:00
Cameron653
b0049c7f0c Adds OD effects 2017-09-10 22:07:29 -04:00
killer653
db3a941652 Adds numbing bite 2017-09-10 19:21:21 -04:00
killer653
cafac8efae Polaris Sync 2017-08-28 20:52:11 -04:00
Ketrai
15d978ba1c indentation is evil
Beware of copy-pasting code fuck
2017-08-28 22:39:32 +02:00
Ketrai
bcccf8e6f8 attempts fixing primal cubes again 2017-08-28 22:34:36 +02:00
Ketrai
f03b7a3e38 Fixes snack_vr dm for primal additions 2017-08-28 22:17:56 +02:00
Ketrai
8c0b06fc39 Adds the cubes themselves for the monkeys
as the titles says
2017-08-28 21:38:55 +02:00
Mechoid
0366320ae7 Gripper Fixes and Updates 2017-08-07 12:10:23 -07:00
killer653
468e73c7f3 Polaris sync 2017-08-06 19:07:17 -04:00
Neerti
99eb6f9404 Updates Tools
Adds toolspeed var, which is a multiplier on how 'fast' the tool works.  0.5 means it goes twice as fast.
Adds usesound var, which determines what sound is used when a tool is being used.
Changes a lot of code to use those two vars instead.
Adds 'ayyy' tools, which are ported from /tg/'s abductor gamemode.  They're currently admin only but I might make them obtainable by xenoarch later.
Adds powertools, also from /tg/.  CE starts with them in a new toolbelt that spawns in their locker, ported from (you guessed it) /tg/.
Changes welder sprites to look nicer, ported yet again from /tg/.  Modified the blue welder slightly so it can be the electric welder sprite.
Adds various sounds from /tg/, for tools and welders.
2017-08-03 04:49:23 -04:00
MagmaRam
2ca3c4f38c Merge pull request #3603 from Anewbe/drug_tweaks
Caps the negative effects of the high-end drugs
2017-07-28 15:23:59 -05:00
MagmaRam
f59cfae29a Merge pull request #3646 from Anewbe/hyperzine_tweaks
Hyperzine is no longer toxic
2017-07-28 15:18:03 -05:00
killer653
4fcbbe40f1 Size changes. 2017-07-28 06:43:44 -04:00
Anewbe
41e199cb92 The drink Balloon can now be made 2017-07-26 18:57:29 -05:00
Anewbe
5ae30058c0 Diona no longer gain nutrition from food 2017-07-26 17:48:33 -05:00
Anewbe
a2bea11d14 Hyperzine is no longer toxic 2017-07-26 13:45:13 -05:00
SilveryFerret
c8fc6f25e5 Oxyphoron change proposal (#3634)
* Changes oxyphoron to hydrophoron

* Stops hydrophoron magically producing oxygen

Instead, it creates a spark when it's tossed on the ground., and shoves
phoron into the air. Hooray!

* Change hydrophoron touch_turf proc at Anewbe's request

* Missed a /2
2017-07-25 16:44:30 -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
silveryferret
7567726c07 Ports R-UST from Baystation12 + small admin debug verb 2017-07-19 20:33:16 -04: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
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
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
Anewbe
1f4e2d4a5b Caps the negative effects of the high-end drugs 2017-07-15 19:22:59 -05:00
Andrew
4b0549f946 Cyborg Item Changes
Research Cyborg
-Science gripper can now pick up health analyzers
-External organ gripper renamed to robotics organ gripper
-Robotics organ gripper can hold synthetic eyes
-Picking up brains has been moved to robotics organ gripper

Medical Cyborgs
-Chemistry gripper renamed to medical gripper
-Medical gripper can now hold pills and blood bags
-Crisis cyborgs now have crisis hyposprays which include dylovene
-Crisis cyborgs now have advanced burn and trauma kits instead of bruise
packs and ointment
-Surgeon cyborgs now have medical grippers
-Surgeon cyborgs now have surgeon hyposprays which replace tramadol with
oxycodone
-Oxycodone has been made scannable by health analyzers
-Surgeon cyborgs given a dropper to do the necrosis removal operation

Service Cyborgs
-Now have a multitool to cryogenically freeze plants
2017-07-11 20:09:19 -05:00
Cameron653
0a3a043cb6 Updates the block list in lunch.dm 2017-07-04 20:13:14 -04:00
Cameron653
74107add10 Makes nuka cola great again. 2017-07-04 19:48:03 -04:00
Leshana
18b1828631 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630 2017-06-30 22:31:43 -04:00
Cameron653
a35f759e4c Mutagenic chemicals tweak 2017-06-28 15:32:13 -04:00
Cameron653
a910ed7ebb Removes a comma that allowed nuka_cola to spawn in
No fun allowed.
2017-06-17 00:09:58 -04:00
Leshana
c91dc333cd Some more types which need Destroy to return qdel hints! 2017-06-14 01:13:54 -04:00
Leshana
48edfb2fdc Some more types which need Destroy to return qdel hints! 2017-06-14 00:59:32 -04:00
Leshana
e644dbe18a Destroy() cleanups in VOREStation code
* Remove remaining hard del()'s in our code.
* Replace deleted() and gcDestroyed with QDELETED macro.
* Fix some strange calls directly to Del() (capital D)
* Make Destroy() return qdel hints.
* Make a few of the Destroy()'s more comprehensive in cleaning up references.
* In edited Destroy() procs, converted to use qdel_null and qdel_null_list macros when possible for pretty code.
* Removed unused variable `sleevecard`
2017-06-10 22:44:03 -04:00
Leshana
5a02b7e5c7 More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-10 22:41:51 -04:00
Leshana
aab81abb12 Remove redundant cleanup of /atom/var/reagents
* /datum/reagents/Destroy() does everything /datum/reagents/delete() does and more, and delete() is called only from /obj/effect/Destroy() which is *itself* redundant with its parent /atom/movable/Destroy()
2017-06-10 22:41:51 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
Anewbe
5d81148ab8 Merge pull request #3511 from VOREStation/garbage-subsystem
tg Garbage Subsystem
2017-06-10 17:20:22 -05:00
Leshana
69a50ec225 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170609
# Conflicts:
#	code/_macros.dm
#	code/controllers/master_controller.dm
#	vorestation.dme
2017-06-09 22:54:16 -04:00
Arokha Sieyes
6d58df9f60 Surgery and syringe fixes
Fixes a line printed about staying close to your patient printed in error, and makes syringes work on laying patients again.

The do_surgery overrides are from a bygone era.

Tested == yes
2017-06-09 02:11:23 -04:00
Arokha Sieyes
a208283706 Surgery and syringe fixes
Fixes a line printed about staying close to your patient printed in error, and makes syringes work on laying patients again.

The do_surgery overrides are from a bygone era.

Tested == yes
2017-06-09 02:10:09 -04:00
Screemonster
c45ddb6d27 further fixes 2017-06-06 21:04:51 +01:00
Screemonster
26e817981a chimera bugfixes and tweaks 2017-06-06 12:23:03 +01:00
Leshana
e48b548f2b More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-05 23:01:41 -04:00
Leshana
733f69a474 Remove redundant cleanup of /atom/var/reagents
* /datum/reagents/Destroy() does everything /datum/reagents/delete() does and more, and delete() is called only from /obj/effect/Destroy() which is *itself* redundant with its parent /atom/movable/Destroy()
2017-06-05 22:10:07 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-05 22:10:06 -04:00
Leshana
d438cba406 Fix do_after exploits in Water-Coolers
* Fixes https://github.com/VOREStation/VOREStation/issues/561
* Prevents multi-clicking from doing the construction steps multiple times (spawning multiple jugs, or emptying contents of jug multiplie times).
* Prevents after-attack from transferring reagent from jug to cooler twice when putting a jug on.
2017-06-05 15:04:29 -04:00
Pear120
7b65a8836f Update glass.dm 2017-06-04 18:26:59 -04:00
Pear120
5fbb93551d Allows soap and rags to be wet using buckets 2017-06-04 17:41:41 -04:00