Commit Graph

6358 Commits

Author SHA1 Message Date
Joan Lung e83d72219d Soft crit, except not terrible (#30262)
* Soft crit, except a little bit harder.

* tweak

* 👌

* why was this even in here

* no radios in critical

* fix that too

* keep to original logic

* not very smart, really

* tip: do nothing tgui-side that you can do code-side, because we can't do defines in tgui

* blood trail

* can't do blood trails

* how does this even work

* harsher slowdown and more obscured vision

* it really puts it into perspective; you're fucking dying.

* stat_attack

* stop fuckin whispering into radios or whatever it is you're doing

* more fixes

* fix

* fix

* fix the radio shit

* bikeshed?
2017-09-04 18:58:34 -05:00
pubby 283da7778c Fix monastery shuttle + Pods (#30375) 2017-09-04 11:00:07 -03:00
XDTM a1773dc5d6 Fixes storage deletion bug, again (#30355)
* Fixes storage deletion bug, again

* non-hacky fix
2017-09-04 14:08:27 +02:00
pubby 7d8c241e6c Pinpointer runtime fixes 2017-09-01 16:04:08 -05:00
MoreRobustThanYou c48def94d8 Removes gangs (#30056) 2017-08-31 17:31:49 -03:00
pubby 6eb61d6f41 Crew monitoring rework part 1: crew pinpointers (#30117)
* Pinpointer refactor + Crew pinpointers

* Icon update

* Add crew pinpointers to maps, closets, and fix

* Fix defines

* Cyberboss fixes + add to warden and CMO

* More Cyberboss fixes
2017-08-30 18:02:28 -04:00
oranges 846c10e65a Merge pull request #30251 from ChangelingRain/newcultblade
Gives cult blades updated item and inhand sprites
2017-08-30 10:08:05 +12:00
Jordan Brown 25ef4655f8 Stealth Option for RadioactiveMicro (#30098)
* Update traitordevices.dm

* Update traitordevices.dm

* Update traitordevices.dm

* brackets?

* Code cleanup

* Add missing path extension
2017-08-30 10:05:04 +12:00
Jordan Brown 9bae1264a5 Merge pull request #30240 2017-08-29 10:44:09 -04:00
kevinz000 7ca2f5e747 Fixes grenade logging (#30175)
* Update grenade.dm

* Update grenade.dm

* Update ghettobomb.dm

* Update ghettobomb.dm

* Update grenade.dm

* Update grenade.dm

* Update grenade.dm

* Update grenade.dm

* Update grenade.dm
2017-08-29 10:31:23 -04:00
Leo 33d0a8d2d0 Merge pull request #30238 from kingofkosmos/fixesingredientsboxsprite
Fixes ingredients-box sprite.
2017-08-28 16:38:27 -03:00
shizcalev 2427f217f7 Standardized power displays 2017-08-28 14:22:05 -04:00
Joan Lung 83b9e0c120 right, chaplains get this 2017-08-28 12:05:04 -04:00
kevinz000 1f7de416b3 Update implant_explosive.dm (#30231) 2017-08-28 00:12:17 -04:00
kingofkosmos 527ff30cdd Fixes ingredients-box sprite. 2017-08-27 22:05:36 +03:00
Cyberboss b806a76811 Merge pull request #30173 2017-08-26 11:34:53 -04:00
Remie Richards a916f3598b Maintains that weird entire-tcomms-setup-in-one-machine thing (#30172)
* Maintains that weird entire-tcomms-setup-in-one-machine thing that's only used on away missions

It had a var for intercepting signals and duplicating them to the syndicate channel, but it never used it, and only sent things if they were already syndicate communication... wat.
2017-08-26 10:04:12 -03:00
oranges 11cf723a95 Traitor, a traitor is a traitor.
Means that one of the crew members works for a criminal Syndicate and
must something to seize / kill someone / someone to protect and dump
from that Durkee on the shuttle. At English stations the word everyday,
for Russians for the mention of the word "traitor" is not in the chat
(IC) admins are stroking the head with a bangammer. So this word and
memetic.
2017-08-25 08:31:07 +00:00
Leo aa0844a578 Merge pull request #30112 from YPOQ/toysoundfix
Fixes sounds for toy nuke, red button, and talking action figures
2017-08-24 08:57:02 -03:00
kevinz000 169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00
MoreRobustThanYou 0a530cff9c Refactors forensics to a datum (#29542)
* ports plasmeme windows from /vg/

* Update window.dm

* It's the stairway to seinfield

* fixity fix fix

* See this code if you're wondering why I rarely get any sleep

* *scream

* now

* this is going to give me PTCSD - post-traumatic coding stress disorder

* *scream

* Improves forensics datum

* Meep.

* RA RA RASPTUIN... i'm not crazy, right?

* better

* I think it works... /s

* less compile errors

* Reduces compile errors to a much more managable 50

* shitcode.exe

* ehhh

* HEY EVERYONE, IT WORKS!!

* Make slide code less autistic

* blue skyyy

* no more bay forensics!

* IT  WORKS

* Remove EnforceSize, it isn't used.

* icon2html

* More bicon sutff

* eee

* aeee

* abc

* abc

* a

* abc

* e

* forensics check in initalize

* huh

* bleh

* Update _drone.dm

* Update _drone.dm

* Update _drone.dm
2017-08-24 09:08:22 +12:00
Jordan Brown 41eed1ce22 Merge pull request #30079 2017-08-23 12:04:50 -04:00
Jordan Brown ded46bcd6f Merge pull request #30075 2017-08-23 12:04:43 -04:00
YPO 6bad54226b fixed sounds for nuke, redbutton, and talking action figure 2017-08-22 20:15:04 -06:00
Ergovisavi 9fb70f22d8 ATMOS Resin removes iciness from floors (#29967)
* atmos resin now makes the floor non-slippery, increased the turf coverage of resin by one unit

* Atmos resin removes wetness on floor tiles upon generation
2017-08-22 14:30:23 +12:00
shizcalev ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
Lzimann bd47a3a345 Fixes heater/freezer boards not working properly 2017-08-21 12:32:20 -03:00
Cyberboss 1b2a38c043 Merge pull request #30004 2017-08-19 19:40:27 -04:00
Cyberboss b7beae9da8 Merge pull request #30010 2017-08-19 19:40:26 -04:00
Ashe Higgs dfd642f861 Ports smart metal foam from FTL (#29963)
* Ports smart foam from FTL

* Adds foam grenades to the EngiVend

* Why are you doing htis?

* Stuff

* badoop
2017-08-18 23:05:37 -04:00
MoreRobustThanYou 4f3657a05b Makes RCL icons better at updating
and also fixes buggy ghetto RCL sprites
2017-08-18 14:11:50 -04:00
Jordan Brown a4f3df42ff The TSA has reason to believe there are weapons in the airport 2017-08-18 01:09:07 -04:00
Jordan Brown 728aefbd70 Adds DropLocation(). To generally be preferred to get_turf() (#29814)
Fixes #29802

Unlike get_turf()this will sensibly pick if loc can be safely used
2017-08-18 16:44:20 +12:00
shizcalev 75dc5d8272 Moved emagged var to item parent. 2017-08-17 22:15:11 -04:00
MoreRobustThanYou 093cb1a184 Adds RCL inhands (#29964)
* Adds RCL inhands

* Okkk

* MERGE CONFLICKTS 4EVER

* ree
2017-08-17 19:21:06 -03:00
Jordan Brown 641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
Jordan Brown 47e1cfb179 Merge pull request #29934 2017-08-17 10:12:51 -04:00
AnturK 94a5f4570a Fixes dumping from inside the lockers (#29896) 2017-08-17 18:57:30 +12:00
oranges b11b33bdac Merge pull request #29954 from Cyberboss/RemoveItemCrafting
Fixes weaponcrafting repath
2017-08-17 10:46:34 +12:00
Ian Turk d50b0c6e63 resolved conflicts 2017-08-16 13:11:21 -06:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00
ShizCalev 24811251a7 Fixed mop inhand, adds new inhand for the advanced mop (#29910)
* inhands

* adds inhand, fixes other inhands
2017-08-16 14:08:18 -04:00
Jordan Brown fab63821f5 Fixes weaponcrafting repath 2017-08-16 12:15:08 -04:00
ShizCalev bfe27a5f98 Merge branch 'master' into crafting-fixes 2017-08-16 11:19:30 -04:00
Ian Turk 1b7ca8c0e5 Resolved merge conflicts 2017-08-16 08:33:24 -06:00
Jordan Brown af4d9a85c9 Repaths /obj/item/weapon to /obj/item (#29929) 2017-08-16 10:38:51 -03: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 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