Commit Graph

9300 Commits

Author SHA1 Message Date
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
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
Leo 690bf32a08 Merge pull request #29981 from Xhuis/spin_spam
Removes the chat message from *spin
2017-08-19 13:21:37 -03: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
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
Iamgoofball 5fef7c6999 Improves bee lore 2017-08-16 21:31:40 -07: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
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
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 f0f456e8c3 Merge pull request #29854 2017-08-14 17:00:16 -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
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 251e12a00c Merge pull request #29853 2017-08-13 02:17:43 -04:00
kevinz000 b9ab67b219 Update emote.dm 2017-08-11 00:11:37 -07:00
Xhuis 8c2c317602 Returns neck slots in get_head_slots 2017-08-10 02:18:06 -04:00
Lzimann 58d0f12c5c Removes a great amount of machinery copypasta with circuitboards.
Also changes New -> Initialize in most of them.
renamed: `code/game/machinery/computer/computer.dm` -> `code/game/machinery/computer/_computer.dm`
renamed: `code/game/machinery/machinery.dm` -> `code/game/machinery/_machinery.dm`
Moved all circuitboards to a new folder at `code/game/objects/items/weapons/circuitboards`
2017-08-09 11:10:48 -03:00
Jordan Brown d1ae0a0c95 Adds helpers to avoid << use (#29611) 2017-08-09 00:27:54 -03:00
Leo faf6c60caa Merge pull request #29753 from tgstation/Cyberboss-patch-4
Makes dummy humans queue instead of harddel
2017-08-09 00:25:06 -03:00
Leo a334615e97 Merge pull request #29779 from ChangelingRain/crusherfix
Fixes the Hierophant not spawning its crusher trophy
2017-08-09 00:23:30 -03:00
Jordan Brown 16592d8472 Merge pull request #29768 2017-08-08 09:58:56 -04:00
Joan Lung 5475339028 Fixes the Hierophant not spawning its crusher trophy 2017-08-07 22:33:46 -04:00
shizcalev 55632c9171 Missed a couple 2017-08-07 19:27:50 -04:00
shizcalev 22764665c9 CentCom Standardization 2017-08-07 19:04:27 -04:00
Tacolizard 6d76903ed4 ian 2017-08-07 11:08:27 -07:00
Tacolizard 7d92f8d365 hivebot init 2017-08-07 11:03:34 -07:00
Tacolizard bbb1c166b7 beepsky init 2017-08-07 10:40:14 -07:00
Jordan Brown 2a5903aa80 Makes dummy humans queue instead of harddel 2017-08-06 19:06:38 -04:00
Cyberboss a2dc6e2c5a Merge pull request #29724 2017-08-06 18:58:26 -04:00
FrozenGuy5 2000984b5a Grossed out grammar fix (#29707) 2017-08-06 20:10:00 +12:00
FrozenGuy5 8049bf02f3 Initialize() Hint 2017-08-04 20:06:02 +01:00
Cyberboss fc0a102753 Merge pull request #29693 2017-08-04 10:21:07 -04:00
Cyberboss 864cfcb6c9 Merge pull request #29692 2017-08-04 10:20:28 -04:00
Cyberboss 004f8f5b2f Merge pull request #29660 2017-08-04 10:19:25 -04:00
Cyberboss 1a578121b2 Merge pull request #29689 2017-08-04 10:18:43 -04:00
oranges 13d6213ab9 Merge pull request #29666 from Qustinnus/dumb
Fixes the amounts for examining disgusted people
2017-08-04 23:56:28 +12:00
oranges 6b6fc91172 Merge pull request #29623 from Cyberboss/TiredOfBS
Removes all checks for subsystem existence
2017-08-04 23:54:47 +12:00