Commit Graph

7208 Commits

Author SHA1 Message Date
Kyle Spier-Swenson
afebc5ef97 Fixes ghost image runtime and see_darkness hiding ghosts again. (#18158)
(also fixes ghost images not garbage collecting.)
2016-06-03 16:49:08 +02:00
Razharas
49f812fada Merge pull request #18149 from KorPhaeron/pAI
pAI ash storm immunity
2016-06-03 08:09:00 +03:00
Razharas
9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
Cheridan
835c35e79e Merge pull request #18111 from optimumtact/restinpeacekeeper
Removes peacekeeper borgs bolas
2016-06-02 02:25:33 -05:00
KorPhaeron
3e3b6268e8 pAI ash storm immunity 2016-06-01 22:32:21 -05: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
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
5cbce38a55 Removes peacekeeper bola snare 2016-05-31 23:21:18 +00: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
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
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
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
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
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
ac5fef551e Fixes beepsky cuffing people with no arms 2016-05-30 20:40:45 -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
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
Cheridan
24b35d410a Merge pull request #18038 from phil235/RobustGrab
Make grab upgrade faster.
2016-05-30 17:02:59 -05:00
oranges
8c67b4f27b Merge pull request #18030 from coiax/fix-17831
Removes inconsistences with UMT and tesla
2016-05-31 09:56:47 +12:00
Razharas
63849fa610 Merge pull request #18037 from phil235/GrabFix1
Fixes bug with blob-zombifying a dragged human.
2016-05-30 19:51:15 +03:00
LatD
d89eb178c6 Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-30 18:33:55 +03:00
oranges
cba22fb1b9 Merge pull request #18041 from Incoming5643/if_your_going_to_use_the_mutations_system_why_not_actually_use_it
Fixes lizard faces and makes angel wings a little more standard
2016-05-30 11:15:41 +12:00
oranges
1ebc858091 Merge pull request #17962 from coiax/admin-logging
Adds admin logging to megafauna movement, shuttle loading
2016-05-30 11:00:14 +12:00
oranges
d31b57f5a5 Merge pull request #17983 from PKPenguin321/patch-5
normal revives cure viruses again
2016-05-30 10:58:32 +12:00
oranges
444748190a Merge pull request #17991 from coiax/fix-17990
Ghost sword orbits on button click, added URL, POI
2016-05-30 10:55:18 +12:00
kevinz000
c88c964f26 Minor Tweaks for PK borgs + recharger (#17940)
Cyborg rechargers now recharge a minimum of 200/tick, up from a default setting of 20/tick
PK borg cookie dispensers now have a 1 second cooldown
PK borg hug shocks has a 2 second cooldown up from 1
Cyborg hyposprays now log
PK borg harm alarm emagged will no longer stun you if you have bowman headset
PK borgs are the only cyborgs that can hugshock and hugcrush (I added hugs for it, medborgs, and standard borgs
2016-05-30 10:52:52 +12:00
Incoming
6d33a64f02 Makes angel wings play nice with the rest of mutant parts and removes some minor snowflakication 2016-05-29 17:56:43 -04:00
Joan Lung
ff4863b188 Merge pull request #18002 from phil235/CocoonAbuseFix
Fixes exploit with cocooning a dragged mob.
2016-05-29 13:19:27 -04:00
phil235
aab577aae7 Make grab upgrade faster. Passive -> Aggressive is instantaneous (unless you count the 1 second click cooldown, same as between two melee attacks). Upgrading to neck grab or kill grab now takes 3 seconds instead of 4. 2016-05-29 17:14:05 +02:00
phil235
0abf5ae6a5 Fixes bug with blob-zombifying a dragged human.
Fixes AI breaking his puller's grip when moving its camera.
2016-05-29 16:11:55 +02:00
Jack Edge
248e2c590b Removes inconsistences with UMT and tesla
- Unstable mutation toxin now acts normally on golems, and can turn
people into golems
- Because there are so many golem subtypes, the only non-blacklisted
golem type is /datum/species/golem/random which will select a random
name and ID and meatype from one of the others.
- Moved the check for a species siemens_coeff (electricity resistence)
down to carbon level, and make it always run. Now golems are immune to
all electricity; no other modification of siemens_coeff are in existing
species code.
- Added an "infinite" var to hyposprays (which includes epipens), which
causes it not to deplete its internal stock if true.
- Adds a species mutator epipen, admin only, used for testing all the
species stuff. A lot of sprites are broken.

🆑 coiax
fix: Free Golem scientists have proved that as beings made out of stone,
golems are immune to all electrical discharges, including the tesla.
/🆑
2016-05-29 12:53:53 +01:00
Razharas
ddfd8f6f35 Merge branch 'master' of https://github.com/tgstation/-tg-station 2016-05-29 05:54:57 +03:00
Joan Lung
e5618e40d0 Ensures Legional continuality (#17972)
* Ensures Legional continuality

* Fixes a bug

* two legions and both of them want you dead
2016-05-28 16:29:37 -05:00
Joan Lung
04f45cfe14 Merge pull request #17922 from Xhuis/momentous_face
Clockwork Cult Patch I
2016-05-28 15:58:16 -04:00
phil235
af2bac81b7 Fixes exploit with cocooning a dragged mob. 2016-05-28 19:04:11 +02:00
coiax
d15e4dec13 Removes dragon's blood drop (#18001)
[s]Removes dragon's blood drop
2016-05-28 11:47:42 -05:00
Lularian
8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
Jack Edge
be3a3a8e6c Make all ghosts normal again on sword destruction 2016-05-28 16:33:25 +01:00
Jack Edge
3910a546e6 Adds admin logging to megafauna movement
🆑 coiax
rscadd: Admins are now notified if a megafauna uses a wormhole or a
shuttle.
rscadd: A new Shuttle Manipulator verb has been added for quick access
to probably the best and most bugfree feature on /tg/.
/🆑

Megafauna adminnotifies on portal TP

Standard shuttle names and logging

Also ignore .mdme files

Muh commit

Actually works and stuff
2016-05-28 16:26:28 +01:00
Joan Lung
325d8aa807 Merge pull request #17954 from GunHog/Head_Megaphones_100_Percent_Meme_Free
Head Megaphones + Megaphone changes
2016-05-28 10:40:31 -04:00
phil235
1f0b53803e Can't break the pull while stunned or unconscious anymore. (#17992) 2016-05-28 08:36:42 -05:00