Commit Graph

1571 Commits

Author SHA1 Message Date
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
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
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
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
VampyrBytes
67018f4638 removes full stops 2016-06-16 19:22:40 +01:00
VampyrBytes
b7bc73a692 moar bugfixes 2016-06-15 20:26:09 +01:00
VampyrBytes
ffc01b6ac2 improves command setting
thanks @Krausus
2016-06-15 18:56:08 +01:00
FreeStylaLT
f03178c1f2 Reduces stetchist's and suppressor's prices 2016-06-15 02:58:26 +03:00
VampyrBytes
5213682c42 adds buzz2 (#4561)
adds buzz2, with target and access for simple_animal/bot
2016-06-13 19:51:40 +01:00
VampyrBytes
15ef6c7f46 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into DatumEmotesMK2 2016-06-13 18:27:01 +01:00
VampyrBytes
7187a5e8e5 Bugfixes 2016-06-13 18:12:05 +01:00
TheDZD
d1f017e684 Merge pull request #4595 from FreeStylaLT/HEAD
Adds Mind Batterer, an AOE Crowd Control Traitor-only device.
2016-06-11 12:06:59 -04:00
FreeStylaLT
235da61ced typos 2016-06-08 23:44:17 +03:00
Matt Milosevic
bc86a86ece Hopefully final 2016-06-08 18:30:26 +02:00
monster860
64ea452f20 Puts UI on it's own plane 2016-06-06 17:12:28 -04:00
Matt Milosevic
86448582aa It lives! 2016-06-06 17:19:40 +02:00
Matt Milosevic
005576c5fe Fixed the runtime, yis! 2016-06-06 16:08:53 +02:00
FreeStylaLT
a66f7e8f4a Made it 5 TC instead of 7 2016-06-05 17:56:49 +03:00
Matt Milosevic
84ec23b1d2 Back where we started... 2016-06-05 00:41:45 +02:00
FreeStylaLT
42ddf3e8c9 Adds Mind Batterer, an AOE Crowd Control Traitor-only device. 2016-06-05 00:14:07 +03:00
Matt Milosevic
a162488f03 Totally refactors and updates the ruins code 2016-06-03 21:26:25 +02:00
TheDZD
f7d4cbe108 Fixes paths, snipers, turrets, mechas, some other things. 2016-05-31 22:50:59 -04:00
TheDZD
8dcf46bf91 Sprites & fixes 2016-05-31 22:50:57 -04:00
TheDZD
a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
Aurorablade
408b19fa7a foxupdate 2016-05-28 06:15:37 -04:00
Aurorablade
bd5a53a410 maybe fixes atmos tech traitor item...
myabe..
2016-05-28 02:04:27 -04:00
VampyrBytes
ac9eac44a1 Adds support for holopad emoting 2016-05-28 05:55:59 +01:00