Commit Graph

22209 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
AnturK
3601ffa39f Merge pull request #30176 from Jordie0608/wellprobablyneverknowwhyatablethatsalwaysbeeninuseandneverobsoletediscalledlegacypopulation
Adds more round id tracking
2017-08-28 12:44:48 +02:00
Cyberboss
4b791e8718 Merge pull request #30222 2017-08-27 19:28:02 -04:00
Cyberboss
89e25d8b73 Merge pull request #30206 2017-08-27 19:27:49 -04:00
Cyberboss
e470aec39a Merge pull request #30204 2017-08-27 19:27:44 -04:00
Cyberboss
c5c8dfdab1 Merge pull request #30200 2017-08-27 19:27:42 -04:00
Cyberboss
c55656f709 Merge pull request #30199 2017-08-27 19:27:40 -04:00
Cyberboss
26baebd499 Merge pull request #30197 2017-08-27 19:27:38 -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
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
AnturK
27b657eb46 Fixes surplus log icons. 2017-08-26 23:26:33 +02:00
Joan Lung
36e62c6efe shift the fix 2017-08-26 14:33:32 -04:00
Cyberboss
c76c50a98b Merge pull request #30113 2017-08-26 11:35:14 -04:00
Cyberboss
d749a2bae3 Merge pull request #30143 2017-08-26 11:35:08 -04:00
Cyberboss
67de15aacb Merge pull request #30162 2017-08-26 11:35:03 -04:00
Cyberboss
983dc5182d Merge pull request #30182 2017-08-26 11:34:47 -04:00
Cyberboss
64a021ccc3 Merge pull request #30191 2017-08-26 11:34:36 -04:00
KorPhaeron
5033fb9cb6 Changes playtime verb name 2017-08-25 23:56:10 -04:00
Joan Lung
65146c8a02 Fixes APC pixel shift being off 2017-08-25 23:10:12 -04:00
shizcalev
b946003be3 Fixes survival_pods being a valid_territory 2017-08-25 20:48:03 -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
vuonojenmustaturska
d54fb51e47 bugfix
Fixes portable chem dispensers charging much slower than possibly intended, also fixes an exploit where RefreshParts() will always
2017-08-26 03:20:31 +03:00
Xhuis
ce41c20170 Splits jungle mobs into their own files 2017-08-25 19:49:58 -04:00
Xhuis
15a014d399 💯 2017-08-25 15:57:41 -04:00
Xhuis
d4e27d7d0f Adds volume control to admin-played sounds 2017-08-25 15:24:05 -04:00
Lzimann
cdd0a04beb Fixes empty adminhelp tickets messages 2017-08-25 16:11:07 -03:00
MoreRobustThanYou
5268c3a36d Update guardian.dm 2017-08-25 11:37:56 -04:00
Jordan Brown
fb134bd487 Merge pull request #30150 from AnturK/memespell
Fixes timestop spell
2017-08-25 10:26:49 -04:00
Jordie0608
b7341a93ae adds more round id tracking 2017-08-25 22:05:32 +10: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
Thunder12345
6f90706b49 It's oranges (#30158)
* It's oranges

* sweeps away the memes
2017-08-24 19:29:12 -05:00
Iamgoofball
e77dc1c217 I was gonna take off my plasma man suit, but then I got high. 2017-08-24 15:32:07 -07:00
Jordan Brown
b4ac34c6bc Merge pull request #30140 2017-08-24 16:38:44 -04:00
Jordan Brown
9cb8867311 Merge pull request #30137 2017-08-24 16:38:40 -04:00
Jordan Brown
685cc968a6 Merge pull request #30129 2017-08-24 16:38:36 -04:00
Jordan Brown
5e70b2075d Merge pull request #30125 2017-08-24 16:38:27 -04:00
Jordan Brown
f88938bf62 Merge branch 'master' into containers 2017-08-24 16:38:24 -04:00
shizcalev
3010674b8b Adds magillitis, a toxin which gorillas monkies 2017-08-24 15:47:12 -04: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
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
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