Commit Graph

16176 Commits

Author SHA1 Message Date
Incoming
ff7e8e433b The true ruination of space: Death to the donut.
All existing structures in space outside of mining/lavaland, the station, and centcom have been converted to ruins.

z10 has been added to maps with lavaland to make the number of crosslinked z levels up to a solid 9.

z10 is the "true deep space" level where nothing can ever spawn, this is mostly because it doesn't exist in some maps.
2016-06-02 19:39:49 -04:00
KorPhaeron
5db8a76217 Revert "Updates some lavaland ruins and adds new ones." 2016-06-01 16:47:16 -05:00
oranges
ce5bd19adb Merge pull request #18107 from lordpidey/lavaland_changes
Updates some lavaland ruins and adds new ones.
2016-06-02 09:07:32 +12:00
oranges
c27a9a21bb Merge pull request #18070 from PKPenguin321/clothing-by-nienhaus
Adds letterman jackets
2016-06-02 09:01:29 +12:00
Cheridan
5e2348fd75 Merge pull request #18077 from KorPhaeron/beepsky_fix2
Fixes beepsky cuffing people with no arms
2016-06-01 12:49:40 -05:00
KorPhaeron
760803fe39 Changes return 0 to return FALSE 2016-06-01 12:23:50 -05:00
oranges
6f866590b1 Merge pull request #18081 from KorPhaeron/create_antag
Create Antagonist Fix
2016-06-01 19:44:03 +12:00
oranges
2dd5f76f30 Merge pull request #18084 from hornygranny/edge_case_dont_real
fixes singularity expanding and eating containment
2016-06-01 19:42:50 +12:00
Cheridan
294eab14a0 Merge pull request #18088 from coiax/fix-18061
Mobs only take damage once from a shuttle roadkill
2016-06-01 02:05:05 -05:00
Cheridan
9b8c68e704 Merge pull request #18065 from coiax/blood-box
Adds "blood freezer" to map; replaces freezer of blood packs
2016-06-01 00:51:52 -05:00
TechnoAlchemist
6878e9fddb Adds luminosity to lasers and sparks. (#18090) 2016-05-31 21:18:09 -05:00
Joan Lung
7259a6370c Merge pull request #18086 from KorPhaeron/Igotpaid30dollarstodothis
New Chaplain Weapons + Mass Driver buff
2016-05-31 19:54:54 -04:00
oranges
7d3e3d0b85 Merge pull request #17832 from KorPhaeron/animes
Just like one of my japanese animes
2016-06-01 10:15:59 +12:00
oranges
5aa4d2710d Merge pull request #18022 from Xhuis/kaput_bird
Fix bundle
2016-06-01 10:15:13 +12:00
oranges
ebe8aa284a Merge pull request #18068 from RemieRichards/is_type_in_FUCK
Typecaches and is_type_in_list() fixes
2016-06-01 10:14:31 +12:00
oranges
83b3faf72f Merge pull request #17676 from Core0verload/they-are-taking-our-jobs
Adds two new modes to cleanbots, allows playerbots to use emag functions
2016-06-01 09:56:13 +12:00
oranges
687cd053e7 Merge pull request #18082 from hornygranny/abhorrent_level_of_power_creep
aliens break cuffs instantly
2016-06-01 09:46:21 +12:00
hornygranny
0ae9ecb91c Update carbon.dm
MUH DEFINES
2016-05-31 14:17:24 -07:00
oranges
2544171982 Merge pull request #18058 from lordpidey/bottlefix
Fixes condiment bottles losing name upon refilling.
2016-06-01 09:17:05 +12:00
Mike Long
f18fdbf73e Fixes wrathhand giving a ranged gib.
Fixes spelling/punctuation on wrathhand.
Removes erroneous include.
2016-05-31 15:43:51 -04:00
Cheridan
1e4585bd86 Merge pull request #17923 from Shadowlight213/dronelight
Doubles drone light brightness
2016-05-31 13:59:52 -05:00
hornygranny
8a65c7e6ec >it's a refactor everything while you're at it episode 2016-05-31 11:55:59 -07:00
KorPhaeron
d4240c5378 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Igotpaid30dollarstodothis
# Conflicts:
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
2016-05-31 12:03:01 -05:00
Mike Long
48540c0558 Removes erroneous code. 2016-05-31 13:01:22 -04:00
Mike Long
cea21e4c57 Updates some lavaland ruins.
Adds lavaland wrath ruin.
Adds lavaland wrath ruin's reward.
Lavaland ruins can now cause sintouching.
2016-05-31 12:57:14 -04:00
Shadowlight213
614a2ab65b Fixes infinite slip 2016-05-31 00:54:50 -07:00
lordpidey
4b586501b0 Toy cargo crate now contains proper stack of space carpet. (#18057) 2016-05-31 02:16:44 -05:00
coiax
372fe31908 Fixes bug where krokodil addiction wasn't horrific (#18075)
Now it makes you a fullblown addict, like it should.
2016-05-31 02:12:43 -05:00
oranges
f9da5c945a dds a proper canUseTopic check to gp (#18072)
also merges range check with canUseTopic via be_close flag
2016-05-31 02:10:36 -05:00
oranges
c7967cb1a7 Merge pull request #18095 from KorPhaeron/drake
Hopefully stops drakes from bugging out
2016-05-31 19:06:33 +12:00
KorPhaeron
ab7b0b6f58 Drake 2016-05-31 02:02:05 -05:00
KorPhaeron
26cbf2e3bb You've been down too long in the midnight sea 2016-05-30 23:35:03 -05:00
Xhuis
555147184e Removes the stuff I promised 2016-05-31 00:18:39 -04:00
oranges
b654016574 Merge pull request #17936 from MMMiracles/ruin_stuff
Adds some spawnable shuttle templates for admin memery
2016-05-31 15:58:12 +12:00
Jack Edge
5c82b8eae0 Mobs only take damage once from a shuttle roadkill
Fixes #18061.

🆑 coiax
bugfix: You can only be damaged once by a shuttle's arrival. It is still
unpleasant to be in the path of one though; try to avoid it.
/🆑
2016-05-31 04:31:08 +01:00
hornygranny
8ee1975b1b fixes singularity expanding and eating containment 2016-05-30 19:51:30 -07:00
hornygranny
b44460c69e MUH DEFINES 2016-05-30 19:38:24 -07:00
hornygranny
40e3b01418 creates instant cuff break system
aliens break cuffs instantly
2016-05-30 19:20:48 -07:00
KorPhaeron
50f8b6d463 Create Antagonist Fix 2016-05-30 21:12:09 -05:00
MMMiracles
d585656950 Potion of Flight (#18019)
* i cant wait to get this to become my snowflake OC

* id

* i dones it
2016-05-30 20:58:34 -05:00
KorPhaeron
ac5fef551e Fixes beepsky cuffing people with no arms 2016-05-30 20:40:45 -05:00
Remie Richards
82a20cc6a1 Splits typecache optimisations out of is_type_in_list(), and into their own proc, is_type_in_typecache()
Adds typecacheof(), a proc to make making typecaches easier
The TESLA now uses typecaches since it benefited greatly from the optimisations
2016-05-31 01:13:47 +01:00
PKPenguin321
537b8d85dc adds letterman jackets 2016-05-30 17:13:00 -07:00
MrPerson
7713a547cd Canisters dump their contents when they burn up (#18043)
Fixes #16713
2016-05-30 18:53:38 -05:00
oranges
96f74377b5 Merge pull request #17929 from coiax/zombie-bugs
Zombies are now a full subspecies
2016-05-31 11:52:59 +12:00
Jack Edge
37acbe9990 Adds "blood freezer", adds to map
No actual changes to the maps themselves, just moving
the bloodpack spawns from map into code.
2016-05-31 00:49:42 +01:00
Cheridan
103fe1d7fa Merge pull request #18010 from TechnoAlchemisto/memoriesbrokenthetruthgoesunspokeni'veevenforgottenmyname
Gives the bartender the slim armor variant.
2016-05-30 18:46:10 -05:00
Jack Edge
6a1c324631 Removes the simple animal zombie code
I removed it from the tgstation.dme anyway
2016-05-31 00:19:46 +01:00
Jack Edge
1ba0fb5aee Infectious zombies are now a full subspecies
Fixes #17932

No more ""infection holder" bursts out of" memes, as zombie infection is
now done with a body egg in the head.

- Added 'romerol' a silent bioweapon reagent that adds the zombie
infection organ to a living person. This will lie dormant until they
die. Then they will stand up again.
- Zombie infection uses body_egg, meaning it shows up on healthHUDs.
- Zombies are now a full subspecies of humans, instead of
simple_animals. However, they should still be mostly the same, still
unable to pick up items, still zombify on attack and still able to claw
open doors.

Side Effects

- Zombies now take time to destroy tables
- Zombies can have their limbs cut off and be reduced to wandering
around being a bit pathetic. This is a feature.
- Zombies can be stunned and are vulnerable to stamina damage and
chemicals
- Zombies are armoured, but instantly die in crit, meaning they have
approximately 120 hp as before
- Zombie hands are just bloody hands, a proper sprite maybe sometime

gjkafldksfjkl
2016-05-31 00:15:10 +01:00
Kyle Spier-Swenson
e7e8710ced fixes gibtonite explosions (#18046)
fixes #17951
fixes #18044
2016-05-30 18:02:11 -05:00