Commit Graph

5888 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
Jordan Brown 837ee8eda9 Merge pull request #30295 2017-09-01 12:42:44 -04:00
MoreRobustThanYou c48def94d8 Removes gangs (#30056) 2017-08-31 17:31:49 -03:00
Joan Lung 90524ea55c Fixes shield blobs not blocking atmos (#30291) 2017-08-31 13:24:21 -05:00
Leo d7fe5e82f9 Merge pull request #30283 from pubby/multiverse
Removes the multiverse and its sword
2017-08-31 14:46:42 -03:00
Ian Turk 246b50bd4e Replaced datacore mob reference with a mind reference 2017-08-30 17:05:31 -06: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
pubby 8c76d02224 Removes the multiverse 2017-08-29 19:27:42 -05: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 f23bb93093 Merge pull request #30250
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com>
2017-08-29 11:22:14 -04:00
Jordan Brown 9bae1264a5 Merge pull request #30240 2017-08-29 10:44:09 -04:00
Jordan Brown c1ef78f8c9 Soft crit (#28649)
* Soft crit

* Fix

* New define

* Fix shitcode

* Tabs not spaces

* Shitcomment

* Default to whispering in soft crit

* Fax
2017-08-28 14:42:11 -05:00
shizcalev 9be4b985a0 Updated clockwork cult to use DisplayPower() 2017-08-28 14:25:24 -04:00
Joan Lung 6d0b0f067d fix 2017-08-28 12:08:17 -04:00
Joan Lung 1ffa93a49d Gives cult blades new icons and inhands 2017-08-28 12:00:00 -04:00
Joan Lung 006d2b011e Cult ghosts can no longer be potentially deconverted or debrained 2017-08-28 11:20:12 -04:00
Cyberboss c5c8dfdab1 Merge pull request #30200 2017-08-27 19:27:42 -04:00
Joan Lung 9556b8edc9 Removes the suppose-to-be unused shuttle wall path (#30214)
* Removes the unused shuttle wall path

* snip SNIP

* SNIP snip

* SNIP
2017-08-27 19:25:30 -04:00
Joan Lung 4482137fd7 Fixes the Geis+Sigil combo (#30205) 2017-08-25 23:29:35 -05:00
shizcalev b946003be3 Fixes survival_pods being a valid_territory 2017-08-25 20:48:03 -04:00
Joan Lung c208d1efa3 Some more tweaks to Geis (#29662)
* Some more tweaks to Geis

* fixes

* it rounds to 0.1

* let's bring this back

* this is kinda shitty but eh

* continually smart

* oh right
2017-08-24 20:46:15 -05:00
oranges 3c38573996 Merge pull request #30148 from kevinz000/revert-29542-wheresmyscanner
Revert "Refactors forensics to a datum"
2017-08-24 20:52:19 +12:00
kevinz000 169a950e7b Revert "Refactors forensics to a datum (#29542)"
This reverts commit 0a530cff9c.
2017-08-23 23:19:48 -07:00
Jordan Brown b208a51975 Fixes supermatter sliver objective being given if there is no supermatter engine (#30032)
* Adds /engine variants of supermatter_shard

* Makes maps use /engine supermatter_shard variants

* Adds a framework for ensuring an objective_item exists before giving it as a target

* Fixes supermatter sliver objective being given with no supermatter engine on the map

* Works around BYOND stupidity
2017-08-24 11:39:35 +12: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
shizcalev ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
shizcalev d72f30d2e0 Cleaned up true and false statements 2017-08-21 01:24:38 -04:00
shizcalev 7168078494 Morphs restore before assuming new form 2017-08-21 01:22:45 -04:00
Jordan Brown 4ef325e14e Merge pull request #30024 from ChangelingRain/fancyark
Makes the Ark of the Clockwork Justicar much more fancy
2017-08-20 20:55:09 -04:00
Joan Lung 5c84310552 faster swap 2017-08-20 12:11:52 -04:00
Shadowlight213 e458845453 Adds tracking amount of time spent playing departments 2: The fall of the Assistants. (#29105)
* Ports Paradise Job exp system

* changed to use json_decode and json_encode as recommended by oranges

* updates changelog

* Reee cyberboss

* Changes to use a seperate table

* Updates database changelog
Changes to use mediumint

* Back to wip we go.
Changes sql stuff to how mso suggested
Attempts the changes requested in the other pr.

* work on stuff.

* work on stuff.

* Renamed proc for time remaining.
Fixed updating time amounts.
Added delay to fix firing at roundstart

* exp is now stored in a global list, and only updated to the db at round end.

* some stuff

* Added button to toggle exempt status on a player.
Still need to make it update the db

* REEE Jordie.
Undoes delaying exp updating to round end.
Adds the updating filtering to the update_exp_client proc which is used again

* Lowers a bunch of the times needed.

* Makes tracking per job instead of per department.
Department time is now calculated from job time.

* Whoops forgot to update master first. Lemme save this

Reverb should play cheeki breeki to people

* I think I did this right.
Too tired to test atm.
Busy rewatching twintails ni narimasu

* Removes var from proc arguments
Fixes database stuff

* Does some requested changes.
Makes special_role be tracked instead of bundled under special.

* Done, but need to refactor how it handles ghost roles.

* Less false data wew

* Changes

* Updates db version
More changes

* More changes

* More changes

* revision fix

* OOPS

* fix schemas

* Makes SQL error logging handled by Execute
Gang role tracking now strips out the gang name and is generic.
2017-08-20 23:01:08 +12:00
Joan Lung e58c92cc05 Makes the Ark of the Clockwork Justicar much more fancy 2017-08-19 13:25:55 -04:00
Leo b53a2247ff Merge pull request #29980 from Iamgoofball/patch-294
Removes blob cuddling
2017-08-18 12:48:30 -03:00
Jordan Brown 641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
Iamgoofball 3685726f7c Removes useless clutter. 2017-08-17 05:00:03 -07:00
MoreRobustThanYou bda8fb9fc8 Blobs can now sense loving cuddles! (#29820)
There is now a chat message when you help intent on a blob
2017-08-17 10:59:56 +12:00
Ian Turk 7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06: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
Leo 5fafb4befe Merge pull request #29889 from Cyberboss/MouseOpacityDefines
Adds defines for mouse_opacity
2017-08-15 13:01:28 -03:00
Jordan Brown 276865f9a8 Merge pull request #29868 2017-08-14 17:00:12 -04:00
Ashe Higgs a944a1f961 !src 2017-08-14 13:43:56 -04:00
Jordan Brown dce49b6caf Adds defines for mouse_opacity 2017-08-14 11:18:22 -04: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
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
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
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