Commit Graph

40933 Commits

Author SHA1 Message Date
shizcalev d4f6f31b06 Improved pull and throw logging 2017-08-15 21:09:26 -04:00
Ian Turk 371f1ba4f0 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-15 16:01:35 -06:00
shizcalev e61381cba6 Fixes MG exploit 2017-08-15 17:51:12 -04:00
shizcalev 9a6d79f73b Fixes leathercrafting 2017-08-15 16:36:37 -04:00
Leo 5fafb4befe Merge pull request #29889 from Cyberboss/MouseOpacityDefines
Adds defines for mouse_opacity
2017-08-15 13:01:28 -03:00
Jordan Brown d144c88fb5 Annihilates the colons! (#29812) 2017-08-15 12:49:35 -03:00
Jordan Brown 23f161517b Makes IRC status return round id (#29888) 2017-08-15 12:01:32 -03:00
Joan Lung 651d2c289c Deathsquads no longer get shielded hardsuits (#29384) 2017-08-15 11:59:21 -03:00
MoreRobustThanYou b6a2d6459d Fixes mining hardsuit heat_protection (#29890) 2017-08-15 07:55:30 -03:00
oranges 46acc55fca Merge pull request #29884 from ShizCalev/singulo-freon
Fixes Singulo, Tesla, Reality Breaks, & Narsie being frozen by freon
2017-08-15 22:10:43 +12:00
Jordan Brown f0f456e8c3 Merge pull request #29854 2017-08-14 17:00:16 -04:00
Jordan Brown 276865f9a8 Merge pull request #29868 2017-08-14 17:00:12 -04:00
Jordan Brown 87ea31f5b5 Merge pull request #29871 2017-08-14 17:00:10 -04:00
Ashe Higgs a944a1f961 !src 2017-08-14 13:43:56 -04:00
shizcalev 2a5df54e7c moved can_trigger_gun to weapon parent 2017-08-14 13:30:20 -04:00
Jordan Brown dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04:00
AnturK 2decd582d1 Tiny bit better splitting on add_details (#29655)
* Tiny bit better splitting on add_details

* More specific

* TESTMERGE_ONLY TEST

* Removes test code
2017-08-14 10:06:04 -04:00
Leo 6b8a379d53 Merge pull request #29841 from tgstation/Cyberboss-patch-2
Makes the ahelp topic give the permissions warning
2017-08-14 08:54:07 -03:00
Leo a8fb983552 Merge pull request #29846 from MoreRobustThanYou/patch-32
Makes mulligan antag check for gamemode required players
2017-08-14 08:24:40 -03:00
Kyle Spier-Swenson 2faec70007 Fix compile warning 2017-08-14 00:58:15 -07:00
oranges ff6219811b Merge pull request #29885 from MrStonedOne/mso_is_chief_sanitation_technician_now
[s] Clean up some inputs
2017-08-14 19:44:05 +12:00
kingofkosmos 58377a4637 Tweaks atmos canister lights. (#29867)
* Makes canisters have no flashing red light when empty.

* Removed two unnecessary lines.
2017-08-14 18:24:10 +12:00
oranges 63b755250e Merge pull request #29870 from MoreRobustThanYou/patch-21
Fixes a typo in the blobbernaut spawn text
2017-08-14 18:22:44 +12:00
MrStonedOne d7a507d412 Clean up some inputs 2017-08-13 22:29:58 -07:00
shizcalev bfa0ab7234 Freon singuloth fix 2017-08-13 23:16:30 -04:00
oranges 8bdf21db5f Merge pull request #29829 from Cyberboss/MergeEntered
Merges the two turf/Entereds
2017-08-14 11:00:36 +12:00
oranges ed58183757 Merge pull request #29828 from Cyberboss/FixTurfSlips
Fixes turf slipping
2017-08-14 10:59:55 +12:00
Joan Lung 6cacf125e5 Ports a slightly edited version of Eris APC sprites (#29809) 2017-08-14 10:53:35 +12:00
Kyle Spier-Swenson f2cf4c2f5c [ready]Makes bIcon better (#29690)
Goonchat will use the asset cache, you now have to specify who to send the icons too.

Goonchat will now load icons in the background, displaying them once they load. this prevents the message from being delayed while the icons are sent.

Icons that aren't preloaded using the asset cache system will not render on ie8 clients. This is because of a ie8 bug that prevents changes on runtime created images from rendering.
2017-08-14 10:40:50 +12:00
Cyberboss 988481354e Merge pull request #29864 2017-08-13 02:18:40 -04:00
Cyberboss 3981166635 Merge pull request #29861 2017-08-13 02:18:28 -04:00
Cyberboss 5e50f8e627 Merge pull request #29858 2017-08-13 02:18:16 -04:00
Cyberboss 251e12a00c Merge pull request #29853 2017-08-13 02:17:43 -04:00
Cyberboss 5e2bf2b4f9 Merge pull request #29849 2017-08-13 02:17:28 -04:00
Cyberboss 3ac1c33fec Merge pull request #29843 2017-08-13 02:17:15 -04:00
Cyberboss 80bd5e3a7f Merge pull request #29840 2017-08-13 02:16:27 -04:00
Cyberboss 38289035d8 Merge pull request #29794 2017-08-13 02:16:14 -04:00
Cyberboss 0c632203c1 Merge pull request #29816 2017-08-13 02:15:58 -04:00
Cyberboss 0b4410cfcf Merge pull request #29826 2017-08-13 02:15:45 -04:00
Xhuis 210f03723e Fixes Syndicate cyborg esword icons 2017-08-13 00:48:33 -04:00
MoreRobustThanYou 1a673d826a Fixes a typo in the blobbernaut spawn text
glob.overminds -> overminds
2017-08-12 23:25:49 -04:00
Xhuis 090f937843 Fixes the Resurrect Cultist rune not working 2017-08-12 19:27:37 -04:00
shizcalev a2e09babd1 Fixed Nanotrasen sign description 2017-08-12 13:34:42 -04:00
shizcalev da70c2f851 Baseturf helper update 2017-08-12 13:27:27 -04:00
Xhuis da80f72dde throw it at him, not me! 2017-08-12 02:11:51 -04:00
Xhuis a57adb7b49 Fixes minebots missing action icons 2017-08-12 02:09:43 -04:00
pubby 1b7797e690 Fix cracked fireaxe cabinet 2017-08-11 16:34:04 -05:00
Kyle Spier-Swenson c2d73dcc46 Remove debug 2017-08-11 13:54:56 -07:00
Leo 2b0e6128b8 Changes the check to prevent any possible href spoofing 2017-08-11 17:31:03 -03:00
MoreRobustThanYou 1ee360f228 His Grace now shows up on the orbit list (#29819)
* His Grace now shows up on the orbit list

* .

* Update his_grace.dm
2017-08-11 17:08:38 -03:00