Commit Graph

22155 Commits

Author SHA1 Message Date
ShizCalev
a3004d3ceb Stops flamethrower crazed gorillas and gives them identifying numbers (#30105) 2017-08-24 08:43:46 -03:00
ShizCalev
188f05ae9f Cleaned up unneeded var from can_use_guns procs (#30106) 2017-08-24 08:43:17 -03: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
Jordan Brown
a218f5d718 Merge pull request #30063 2017-08-23 12:04:25 -04:00
ExcessiveUseOfCobblestone
9055e892f0 Alternative To Removing Kudzu Manufacturing (#30084)
* Update kudzu.dm

* Update spacevine.dm

* Update spacevine.dm

* b

* Removes Airlock nerf [why did this work anywho]

* Removes Spacewalking kudzu

* Eh, I'll do this myself
2017-08-23 12:03:51 -04:00
oranges
0a1d05e5f9 Merge pull request #30068 from ShizCalev/cargo_tech_suit_var
Corrects missing alt_covers_chest var for the cargo tech jumpsuit
2017-08-22 19:46:31 +12:00
TehZombehz
5e6d321d54 Adds Pancakes, Pancake Stacking (#30028)
* Adds pancakes

Adds regular, blueberry, and chocolate chip pancakes as well as stacking
mechanics.

* More accurate chocolate chip pancake description

* Clean up

* Clean up 2
2017-08-22 14:31:04 +12:00
Cruix
3274ad4f12 The syndicate shuttle can now fly anywhere on the station z-level (#29909)
* Updated advanced camera consoles to be more generic

* Renamed /obj/machinery/computer/camera_advanced/proc/EjectUser() to /obj/machinery/computer/camera_advanced/remove_eye_control()

* Added shuttle nagivation computers

* Added the syndicate shuttle computer to maps
Fixed missing icons
Fixed compile error

* Made jumpto_ports use hashset behavior

* Added qdeleted checks
2017-08-22 10:36:43 +12:00
shizcalev
ffa5d9e388 Fixes missing inhands 2017-08-21 18:29:51 -04:00
Emmett Gaines
03eca85d6f Slight on_move.dm rewrite (#30020)
* Minor on_move.dm rewrite

Makes it easier to implement new args
Makes stationary docks move as intended
Some cleanup

* Removes the defines
2017-08-22 09:37:07 +12:00
shizcalev
845abbefca Corrects missing alt_covers_chest var 2017-08-21 02:18:46 -04:00
Supermichael777
b31dc125d8 put him to the mat and start counting 2017-08-20 23:24:00 -04:00
pubby
d2290096c5 Gorillas (#29923)
* Add gorillas

* forgot the sound effect

* Fixes

* Split emotes into new file

* Restore perfect knockdown

* oops

* Gorilla hands

* Cyberboss changes
2017-08-20 20:55:35 -04:00
Jordan Brown
08a1c4bb5c Add logging of deathgasp last words and suicide stats to the death table (#29953)
* Add logging of deathgasp last words

* Column size -> 255

* comment

* Adds suicide tracking to stats death table

* Commas

* Merge the changes
2017-08-21 12:41:34 +12:00
oranges
32929314e3 Merge pull request #30027 from ShizCalev/hide-hair
Fixes hair sticking out of spess helmets
2017-08-20 23:12:25 +12: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
XDTM
28a5901170 You can now click on symptoms in the Pandemic to see their description and stats (#29866)
* You can now click on symptoms in the Pandemic to see their description and stats

* Threshold info

* NO WHITESPACE
2017-08-19 19:52:09 -04:00
Cyberboss
1b2a38c043 Merge pull request #30004 2017-08-19 19:40:27 -04:00
shizcalev
228c1e1fd4 Fixes hair sticking out of spess helmets 2017-08-19 15:38:12 -04:00
Leo
690bf32a08 Merge pull request #29981 from Xhuis/spin_spam
Removes the chat message from *spin
2017-08-19 13:21:37 -03:00
oranges
61227ab7ae Merge pull request #29997 from MrStonedOne/patch-409
readds toggle_hear_radio admin verb
2017-08-19 23:45:41 +12: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
oranges
bf94cc5431 Merge pull request #30005 from Cyberboss/nothing_happened
Fixes stray /weapon
2017-08-19 12:27:13 +12:00
Mike Long
15a549c4cf Makes mixing meth dangerous again (#29968)
* Make Meth Dangerous Again!

* Makes the mob_react variable act like it's named.
2017-08-19 11:59:48 +12: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
oranges
a9ee524218 Merge pull request #29960 from pubby/weed
Fix spelling of "cannabis"
2017-08-18 13:18:55 +12:00
Kyle Spier-Swenson
8340abcd69 readds toggle_hear_radio admin verb
This is a admin version of the ghost preference that hides radio chatter even when human, even from near by radios/intercoms

Its an old verb, it was removed accidentally in my datum top menu rewrite, and it needs to come back because a admin got their shit stuck in disabled and couldn't re-enable it.
2017-08-17 15:43:44 -07:00
Remie Richards
c34cbf3752 Revert "Revert "Revert "Revert "Revert "Improves bee lore" (#29972)" (#29976)" (#29986)" (#29987)" (#29988)
This reverts commit f2a96db8e8.
2017-08-17 21:20:26 +01:00
Kyle Spier-Swenson
f2a96db8e8 Revert "Revert "Revert "Revert "Improves bee lore" (#29972)" (#29976)" (#29986)" (#29987)
This reverts commit 5918156ca3.
2017-08-17 16:20:05 -04:00
Remie Richards
5918156ca3 Revert "Revert "Revert "Improves bee lore" (#29972)" (#29976)" (#29986)
This reverts commit 92e1a1afd1.
2017-08-17 21:04:19 +01:00
Iamgoofball
92e1a1afd1 Revert "Revert "Improves bee lore" (#29972)" (#29976)
This reverts commit e1d876bfcb.
2017-08-17 16:03:52 -04:00
Xhuis
d31285cb1b Removes the chat message from *spin 2017-08-17 12:00:10 -04:00
Jordan Brown
2d26233c6d Merge pull request #29945 2017-08-17 10:13:06 -04:00
Jordan Brown
641ba9c145 Merge pull request #29940 2017-08-17 10:13:00 -04:00
Jordan Brown
4fe6c4f06d Removes redundant check (#29950) 2017-08-17 10:30:59 -03:00
Shadowlight213
e1d876bfcb Revert "Improves bee lore" (#29972) 2017-08-17 08:50:28 +01:00
AnturK
94a5f4570a Fixes dumping from inside the lockers (#29896) 2017-08-17 18:57:30 +12:00
Iamgoofball
5fef7c6999 Improves bee lore 2017-08-16 21:31:40 -07:00
nicbn
ab406fbccf Changes smes, cells, cell charger, terminals and apcs icons (#29931)
* 1

* Cell charger shows what's inside

* CONSTRASTE!

* charge! bar

* kindafix offset
2017-08-16 21:02:01 -04:00
oranges
55adaa06c5 Merge pull request #29955 from tgstation/Cyberboss-patch-6
Removes admin type shortcut for /weapon
2017-08-17 11:50:05 +12:00
oranges
50de9ae586 Merge pull request #29914 from ShizCalev/baseturf-move
Relocates baseturf helper
2017-08-17 11:06:49 +12:00
BeeSting12
6899ec420d Removes meth explosion syringes (#29912)
balance: The meth explosion temperature has been raised.

Being shot and exploded in under five seconds in a relatively easy to make manner is not fun for anyone.
2017-08-17 10:58:53 +12:00
oranges
bb45919ae6 Merge pull request #29688 from PraiseRatvar/PraiseRatvar-patch-1
Nerfs L6 SAW Hollow Point Bullets from -10 armour penetration to -60 armour penetration.
2017-08-17 10:53:33 +12:00
Ian Turk
7460f2c5b8 Replaced flags with flags_1 2017-08-16 13:01:15 -06:00