Commit Graph

22453 Commits

Author SHA1 Message Date
MoreRobustThanYou
529bb908f7 FIXES NEW TEMP SYSTEM
WOOPS.
2017-09-19 05:16:15 -04:00
MoreRobustThanYou
96718e9648 Cleans up internal temp code (#30715)
* cleanup

* Update living.dm

* Update atoms.dm

* Update objs.dm
2017-09-19 21:01:42 +12:00
pubby
01dac64000 Remove unused check_pressure proc (#30853) 2017-09-19 00:26:24 -05:00
Robustin
2a8047ea9c Zombie claws do +1 damage (#30826)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Zombie claws do one more damage

* Update items.dm
2017-09-19 00:07:13 -05:00
Emmett Gaines
76c08c601a New squeaky datum and plushes (#30710)
* New squeaky datum and plushies

new plush subtype
clown shoes, bike horns, and mice slightly changed to use the datum

* narsie and ratvar plushes

* fixes duplicate obj/item/attack_self()

and other misc requested changes

* moves the sounds into initialize
2017-09-18 12:49:03 +02:00
Cyberboss
9bd4ead29f Merge pull request #30820 2017-09-17 21:08:42 -04:00
Cyberboss
0d02779410 Merge pull request #30821 2017-09-17 21:08:31 -04:00
Cyberboss
8109e26c09 Merge pull request #30823 2017-09-17 21:08:21 -04:00
Cyberboss
08a3c4bd0d Merge pull request #30824 2017-09-17 21:08:12 -04:00
KorPhaeron
4ede789cc7 The code standards keep changing and it frightens me 2017-09-17 18:22:39 -05:00
pubby
1e4d1ca42f Traitorbro gamemode (#30344)
A dead-simple traitor variant.

It's like traitor, except instead of an uplink you get a buddy: your blood brother. You must team up with your brother to complete your objectives. It runs along side regular traitor mode, thus the name "traitorbro".
2017-09-18 11:02:23 +12:00
Jordan Brown
464e92d335 Minor tweaks to an if (#30683)
* Minor tweaks to an if

* Whoops
2017-09-18 10:45:34 +12:00
Ashe Higgs
78d9674f4d Adds some new drink functions, buffs Brave Bull (#30521)
* Adds some new drink functions, buffs Brave Bull

* Light holder object

* Cleans Tequila Sunrise if its light object is eaten

* QDEL_NULL

* Health clamp
2017-09-18 10:31:40 +12:00
jughu
87c404f672 Adds Lavaland items to weapon exports for cargo (#30403)
They're expensive, but those mobs are quite difficult to kill
2017-09-18 10:25:04 +12:00
vuonojenmustaturska
a0fc9c3af8 Enables Dead OOC at round-end (#30716)
* Enables Dead OOC at roundend

* proc

* proc #2
2017-09-17 17:22:12 -04:00
Cyberboss
281b77af99 Merge pull request #30785 2017-09-17 15:35:35 -04:00
Cyberboss
ac759e76cf Merge pull request #30801 2017-09-17 15:35:25 -04:00
Jordan Brown
dae7b475b0 Admins in chat are notified if an ahelp is answered in game (#30638)
* Admins in chat are notified if an ahelp is answered in game

* Further sanity
2017-09-18 02:33:31 +10:00
pubby
fa3ea7d803 Fix maple shotgun icon_state (#30796) 2017-09-17 13:41:43 +02:00
shizcalev
81e5154a70 Various grammar fixes 2017-09-17 01:46:41 -04:00
ShizCalev
e679b62516 Varedit cleanup mk4 (#30794)
* Cleans up and corrects a bunch of varedits

* Plant varedits

* More layers

* Adjusted plant name/description
2017-09-17 00:11:18 -05:00
shizcalev
b2aa276c5c Fixes bluespace golem teleport icon 2017-09-17 00:10:38 -05:00
KorPhaeron
1eb9a759a3 Proper use of var names 2017-09-16 20:15:15 -05:00
KorPhaeron
379c2f48f7 Fixes the magic ladder 2017-09-16 20:11:48 -05:00
vuonojenmustaturska
57635219da Fixes chemfridges not displaying items with dots in their name properly 2017-09-17 03:39:10 +03:00
KorPhaeron
de3a4cbad6 Fixes blackbox exploits 2017-09-16 18:55:12 -05:00
YPOQ
51bdfae73b Stops AIs from taking actions while depowered (#30723)
* Stops AIs from taking actions while depowered

* add spans
2017-09-16 17:06:32 -04:00
pubby
e9575e2b46 Fix clothing crafting menu for realsies (#30776) 2017-09-16 17:02:16 -04:00
Robustin
5be486e7c3 Monkeys are now more likely to become Gorillas (#30775)
* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Monkey to Gorilla now more likely
2017-09-16 14:58:40 -05:00
Tungsten
c0bf4e530b Added the thing that Cruix wanted 2017-09-16 10:11:03 -04:00
AnturK
ba204327ee Fixes remaining dummy delete runtime. 2017-09-16 12:54:37 +02:00
TungstenOxide
571d7e44d3 Quick pAI software buying tweak 2017-09-15 22:27:15 -04:00
Jordan Brown
adc4d49164 Merge pull request #30735 from ShizCalev/numbers
Cleaned up some decimal values.
2017-09-15 16:47:55 -04:00
kevinz000
efe3bc3162 (Hopefully) Lessens preferences and manifest injection lag (#30596)
* first step to fixing a potential problem is identifying it

* woops

* kk

* mso is already doing this kek

* yeah lets do that too.

* replicated code

* wups

* wups

* better

* gibe the merge b0ss

* cyberboss

* Update dummy.dm
2017-09-15 15:14:28 -04:00
vuonojenmustaturska
4aa84635dc Removes corgis as a facehugger target (#30719) 2017-09-15 05:15:18 -05:00
KorPhaeron
ed43a09864 Prevents the creation of Shadowzombiechangelings (#30681)
* Prevents the creation of Shadowzombiechangelings

* You can still zombie yourself if you really want

* (
2017-09-15 10:07:03 +02:00
Militaires
20a1a816ab Procedurally generated Gondolas. (#30700)
* Adds Gondoland and the rare Gondolas

* at the end of history

* /lizard >>> /gondola

* expand GOND

* for cyberboss he wants it in TGM

* thicc health

* thiccer health

* Procedurally generated Gondolas

* Procedurally generated Gondolas

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
2017-09-15 01:19:18 -04:00
Jordan Brown
0c25f48b63 Merge pull request #30702 from vuonojenmustaturska/evidencebags
Fixes evidence bags showing ghost contents after their contents get deleted
2017-09-15 01:17:28 -04:00
Jordan Brown
147a1c7410 Merge pull request #30704 from YPOQ/boost
Ninja adrenaline boost removes stamina damage
2017-09-15 01:16:57 -04:00
Jordan Brown
4f3b709e22 Merge pull request #30709 from vuonojenmustaturska/hisgrace
Stops dead monkeys from moving
2017-09-15 01:15:43 -04:00
Jordan Brown
c76356be15 Merge pull request #30712 from pubby/craftingfix
Fix crafting menu runtime
2017-09-15 01:15:01 -04:00
Jordan Brown
6b681a6322 Merge pull request #30724 from JJRcop/saw_that_but_didnt_see_that
Adds a tip to examine for L6 SAW machinegun
2017-09-15 01:14:31 -04:00
vuonojenmustaturska
423f7ca8cf initial stuff 2017-09-14 22:46:36 +03:00
shizcalev
4f5658cfbb Cleaned up some decimal values. 2017-09-14 12:50:06 -04:00
Jordan Brown
c6a4b3730c Merge pull request #30665 2017-09-14 12:25:38 -04:00
Jordan Brown
54e63ec14a Merge pull request #30685 2017-09-14 12:25:31 -04:00
Jordan Brown
57184b91c8 Merge pull request #30696 2017-09-14 12:25:27 -04:00
Jordan Brown
512889e5c3 Merge pull request #30697 2017-09-14 12:25:09 -04:00
Jordan Brown
e5929eb15b More admin auth fixes (#30688) 2017-09-14 13:16:23 -03:00
JJRcop
f7ab6256c8 Change loc = to forceMove in bees.dm 2017-09-14 11:34:51 -04:00