Commit Graph

9321 Commits

Author SHA1 Message Date
Leo
53a89cb3fd Reverts soft crit (#30260) 2017-08-28 21:09:29 +01: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
Cyberboss
26baebd499 Merge pull request #30197 2017-08-27 19:27:38 -04:00
ShizCalev
7056b38410 Cleaned up environment_smash vars with bitflag defines (#30154)
* Switched to bitflags

* CB's change.

* fixed

* i can spell i swear

* cb2
2017-08-27 12:49:58 +02:00
Leo
14e63ffd8c Merge pull request #30198 from tgstation/Cyberboss-patch-3
Adds periods to larva roars
2017-08-26 21:04:00 -03:00
Cyberboss
d749a2bae3 Merge pull request #30143 2017-08-26 11:35:08 -04:00
Ashe Higgs
ae66271cf1 none 2017-08-25 20:43:48 -04:00
Jordan Brown
a2350bca66 Adds periods to larva roars 2017-08-25 20:21:46 -04:00
Xhuis
ce41c20170 Splits jungle mobs into their own files 2017-08-25 19:49:58 -04:00
MoreRobustThanYou
5268c3a36d Update guardian.dm 2017-08-25 11:37:56 -04:00
ShizCalev
6741b652a7 Adds CanSmashTurfs proc for simple animals (#30152)
* Adds CanSmashTurfs proc for simple animals

* Changes
2017-08-25 12:39:01 +02:00
ShizCalev
9998e65257 fixes mobs breaking grills underneath windows (#30153) 2017-08-25 12:37:05 +02:00
Jordan Brown
2ce6141628 Credits Roll (#30000)
* WIP

* More wip

* Numbers

* More WIP

* Improve

* Add QDEL_IN_CLIENT_TIME

* More WIP

* Getting there

* Absolute communism

* More stuff

* More states

* MrPerson's suggestion

* Makes it work, now we just need the dmi

* No, that's the null icon_state

* More better

* Fix script

* Turns out we don't need an empty dmi to start with

* Upload a much more complete dmi. Now we just need the identicons

* Fix

* Add the credits tool

* THE FULL DMI

* Mistake

* No need to resize the image if it's already 32x32. Also download the right one in the first place.

* It's oranges

* Transparent opacity

* Make per client

* Run at roundend

* Make tgstation-server great again!

* Speed things up some

* Fix up the verb

* Final touches

* Remove the unecessary .sln

* PraiseRatvar -> Frozenguy5

* New age coding

* Bigger gulps
2017-08-25 15:05:31 +12:00
shizcalev
ca417937e4 OOGAOOGA 2017-08-24 15:09:24 -04:00
Jordan Brown
f5f4f42630 Merge pull request #30123 from optimumtact/asmrdarlingisthebestasmrartist
Dummies no longer queue, which humans probably shouldn't do ever
2017-08-24 14:00:49 -04:00
MoreRobustThanYou
75c197f8d0 Lowers the chance for monkeys to become gorillas (#30120)
* Lowers the chance for monkeys to become gorillas

* Update life.dm

* Update life.dm

* Update life.dm
2017-08-24 13:18:22 +01:00
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
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
oranges
0bdf8306d5 Dummies no longer queue, which humans probably shouldn't do ever 2017-08-23 12:30:35 +00: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
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