Commit Graph

4852 Commits

Author SHA1 Message Date
SamCroswell e139f81412 PDA Slot Removal + PDA ID Changes 2016-07-15 00:54:14 -04:00
Fox McCloud 66d7b89d9a Merge pull request #4838 from FalseIncarnate/paradise_pop
Paradise Pop
2016-07-14 23:58:24 -04:00
Fox-McCloud 5216b39339 Ports TG's Weather System 2016-07-14 04:29:28 -04:00
SamCroswell cf90405f56 Plastic Explosives Update 2016-07-13 22:04:23 -04:00
Fox McCloud 22484a4073 Merge pull request #5012 from Kyep/vampfix
Makes Vampire preference appear on Traitor panel
2016-07-13 03:02:11 -04:00
Kyep 17630cef32 Makes Vampire preference appear on Traitor panel 2016-07-12 23:48:41 -07:00
Fox-McCloud a78c6cbf5d changes 2016-07-11 22:45:44 -04:00
Fox-McCloud 943eb9b6dc grammar 2016-07-11 02:19:24 -04:00
Fox-McCloud 762ed61881 Adds in Rathen's Secret 2016-07-10 20:04:17 -04:00
Fox McCloud c98ba8de79 Merge pull request #4925 from TheDZD/no-looking-back-no-regrets
The Honkening
2016-07-09 18:29:11 -04:00
TheDZD a144980bde Minor tweaks 2016-07-09 11:37:26 -04:00
Crazylemon64 a779fc8663 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins
All hail glorious leader tigercat
2016-07-08 00:16:28 -07:00
Crazylemon64 20eee9064c Fixes init on various things, as well as allowing the
map loader to safely load templates mid-run
2016-07-07 23:52:44 -07:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TheDZD 9cfb3dc644 Overeating is bad for you 2016-07-07 21:58:34 -04:00
TheDZD 52e6df894e The Honkening 2016-07-07 21:35:19 -04:00
Crazylemon64 f0bac4c179 Initialization deferral is now handled by the caller, but
is now also seamless
2016-07-07 00:17:21 -07:00
Krausus 783536d278 Replaces ID photos with bicons 2016-07-07 01:25:56 -04:00
Krausus b37cecbeae Fixes various runtimes (squashed)
- Fixes runtime in pod lock busters
- Fixes possessed object examination runtime
- Fixes runtime when following a destroyed mob
- Fixes to_chat runtimes from involuntary emotes
- Fixes runtimes from invalid clothing IDs
- Fixes runtime caused by wirecutting non-humans
- Fixes runtime when setting up malf AI antaghuds
- Fixes runtimes in sensory destruction reagents
- Fixes runtime caused by clientless ghosts
- Fixes antag hud runtime in autotraitor generation
- Fixes welding tool shutoff runtime
- Fixes runtime in laptops' welcome program
- Fixes to_chat runtime from mech sound effect
- Fixes runtimes in camera-using NanoUIs
- Fixes to_chat runtimes in resisting held mobs
- Fixes headless mob skeletonizing/husking runtimes
- Fixes non-mob add_logs runtime
2016-07-05 23:30:01 -04:00
Crazylemon64 27ee3c7247 It's re-entrant now 2016-07-04 14:52:19 -07:00
Crazylemon64 2c4d8e9b6a You can now load the cyberiad runtime-free 2016-07-03 15:36:38 -07:00
Crazylemon64 f2b48c7c67 You can now load the cyberiad with the map-loader 2016-07-02 22:50:45 -07:00
Crazylemon64 0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
TheDZD 21ebb83b7a Merge pull request #4835 from Fox-McCloud/sniping-nukies
Adds Sniper Rifle to Nuke Ops Uplink
2016-07-01 20:36:48 -04:00
FalseIncarnate 496c3a7843 Paradise Pop
Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!

Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes

The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.

Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!

Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)

Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
2016-07-01 13:31:09 -04:00
Fox-McCloud 19f98e860c Adds Sniper Rifle to Nuke Ops Uplink 2016-06-30 20:07:13 -04:00
Fox-McCloud a2ac239426 Reverts Emote System 2016-06-30 19:13:13 -04:00
TheDZD 3a262b7a67 Merge pull request #4777 from Kyep/mindshield
Renames Loyalty implants to Mindshield implants
2016-06-30 12:03:03 -04:00
TheDZD 784b299fe2 Merge pull request #4822 from Fox-McCloud/laughter-demon
Ports TG's Laughter Demon
2016-06-30 11:25:58 -04:00
VampyrBytes e783be45dc fixes farting dead (#4823)
fixes #4821

wasn't anything to do with the deathgasp fix, and it was only the *me
emote, but yeah, not good

🆑 VampyrBytes
fix: No more *me emoting from your corpse!
/ 🆑
2016-06-29 13:23:17 -04:00
tigercat2000 282e8088b2 Runtime & Goonchat fixes (#4820)
* Fix goonchat banned-cookie misdetection

* Runtime fixes

* Fix #4813

* Fix #4818

* Whoops.

* Actual emote runtime fix
2016-06-29 11:12:16 -04:00
Fox-McCloud d61583dd1f better handling 2016-06-29 11:08:51 -04:00
KasparoVy 38717e3b03 Fragments Markings, Adds Tail and some Body Markings, Tajara Heads now have Ears
Adds Tajara inner ear and muzzle colouration as head markings, adds muzzle colouration for Unathi (sharp and round) as head markings, adds belly colouration for Tajara and Unathi as body markings.
Fixes issue where the Unathi stripe marking name in sprite_accessories was incorrect.
Also fixes a bug where setting your IPC's head to 'normal' gave it a random screen style that was often not compatible with the monitor head.
Does a bit of tidying up in tail generation mainly, but also in icon skin-tone handling and just about everywhere else I ended up working.
Adds ears to Tajara heads. Removes ears from tajara hairstyles.
Removes the now pointless Tajaran Ears hairstyle and renames the Tajaran hair objects appropriately.
Adds a Vulpkanin Body Marking and some Tail Markings.
2016-06-27 05:29:01 -04:00
VampyrBytes b537758aef Fixes deathgasp and emote colour (#4790) 2016-06-26 18:30:59 -04:00
TheDZD b54b3a8fb2 Merge pull request #4775 from Fox-McCloud/mutate-fix
Wizard Mutate Spell Fix
2016-06-26 14:58:54 -04:00
monster860 7cd2ace5b2 Makes pulsing door wires non-blocking (#4781) 2016-06-26 13:59:03 -04:00
Kyep 7a8480b1a5 more text changes 2016-06-25 18:59:10 -07:00
Kyep 55d0472268 Initial checkin 2016-06-25 00:35:00 -07:00
Fox-McCloud c6117cfa5a Wizard Mutate Spell Fix 2016-06-25 02:46:17 -04:00
Crazylemon64 a4fde648e7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-06-24 16:03:10 -07:00
tigercat2000 732c3b4ae5 Goonchat (#4744)
* bicon regex run

* Remove all \black

* Goonchat from /vg/ / Goon

Whoo!
Special thanks to @Tastyfish for the macro2html thing so all of our
horrible color macros keep working and don't fail horribly <3

* Fixes and changes n stuff

- Made ping sane again (the fuck PJ)
- Updated chat CSS
- Fixed like one problem with a color macro

* whoops

* Restore /vg/'s pingloop stuff (used to avoid fucking up is_afk)

* Strip problematic tags from tcomm scripts

- <audio>
- <video>
- <iframe>
- <script>

* Fix human examine icon

* Name hotkey elements

* Removed old stylesheet
2016-06-23 16:56:15 -04:00
Tastyfish b8c1418b57 Adds simple obj to load in templates (#4740)
Also template loader bugfix
2016-06-23 04:20:26 -04:00
Krausus 22a3bcf704 Emote Fixes and "Me" Tweak (#4749)
- Tweaked "Me" verb to allow inclusion of the message when typing
directly into chat box.

- Fixed ghosts, with ghostsight on, seeing emotes twice when near the
emoter.

- Fixed *flip runtiming when used with no target and no grab.

- Fixed scream not displaying any message.

- Fixed double sanitizing in custom emotes.

- Fixed several cases where user wasn't getting passed into proc calls.

- Removed a couple unnecessary periods from dialogs.
2016-06-22 14:24:22 -04:00
Aurorablade a02a38b6e9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-06-21 07:42:29 -04:00
taukausanake 795271048d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plant_hud 2016-06-20 11:23:28 -05:00
TheDZD 12314b64e7 Merge pull request #4349 from VampyrBytes/DatumEmotesMK2
Datum Emotes MK II
2016-06-19 14:04:00 -04:00
VampyrBytes 3ace8c09ed Sorts out ending punctuation 2016-06-19 18:48:43 +01:00
VampyrBytes 6d487a19b7 Sorts out issues raised by Fox & DZD 2016-06-19 18:03:51 +01:00
monster860 3295020088 Merge branch 'master' into ui_plane 2016-06-19 12:38:00 -04:00
VampyrBytes e346003268 Cancel now cancels the emote, none is an option where applicable
As discussed with @Krausus
2016-06-17 00:15:14 +01:00