2605ed586b
Reverts dominator sound change
...
Dominator sets Delta Alert now
Delta Alert text changed to accommodate this change (+3 squashed commit)
Squashed commit:
[3129c95] Icon state update
[21bddf3] Dominators play the malf sound when activated (until I can find a better alternative).
[2289074] Unfucks changelog (+1 squashed commits)
Squashed commits:
[2289074] Unfucks changelog
2015-06-18 23:00:04 -06:00
e1356f889e
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-18 23:37:06 -04:00
ea1df76a6d
Hitby messages removed, may help with singularity lag from throwing
2015-06-19 15:32:56 +12:00
46a5e578e4
Gang Update: Fashion War Edition
...
This update primarily deals with gang outfits and expands on how they affect the round.
2015-06-18 20:01:57 -06:00
9e7c67c6a5
Fixes a check
2015-06-18 14:55:35 -07:00
f15c81d527
Caps armour to 90% damage reduction, bai bai invincibility, Adds armour_penetration variable to /item, counted for melee weapon and gun combat, Xenomorphs also have 10 armour_penetration per attack.
2015-06-18 20:36:36 +01:00
86d0a50776
Revert dump_act and dump_from_storage
2015-06-18 21:21:41 +02:00
ad3f81f88d
Custom spawn points and reforming ectoplasm
2015-06-18 13:18:53 -04:00
1c83cc6d45
Pray pray pray
2015-06-18 18:07:57 +01:00
c2087e8cea
fix according to miauw
2015-06-18 12:02:05 -05:00
38ab424b8b
More OOP! Also preparing the bases for another future PR.
2015-06-18 18:59:04 +02:00
172ee5ec67
Fixes being able to unbuckle yourself while straightjacketed
2015-06-18 18:41:22 +02:00
bfb66ed518
Some more changes
2015-06-18 12:19:13 -04:00
470f21a752
Merge pull request #10004 from Ikarrus/gangimplants
...
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05:00
373c918a4a
Going through some hOOPs - bit of a overhaul.
2015-06-18 17:40:35 +02:00
e6dcabf245
Merge pull request #9960 from xxalpha/bass
...
Put drop_item() calls inside ifs. Replaced some drop_item() with unEq…
2015-06-18 15:50:35 +02:00
62b2b87307
buffed explosion, removed message
2015-06-18 08:41:50 -05:00
8a8dde0f73
whoops
2015-06-18 04:56:09 -05:00
c3170eaae8
Fixes Posibrains removing Traitors from check antags and also being pulled out of posibrains when debrained
2015-06-18 01:28:10 -07:00
a7b9c7d9c9
user.incapacitated and other player requests
2015-06-18 03:22:59 -05:00
08d273e9bd
Removes some coffee stains
2015-06-18 00:07:32 -04:00
984ad17613
Merge remote-tracking branch 'remotes/upstream/master' into fuggingRevenants
2015-06-18 00:05:45 -04:00
dd2e262344
A bit more work
2015-06-18 00:02:16 -04:00
fe14ff46ee
- Reduced uzi ammo to 25 influence cost
...
- Added uzis to summon guns
- uncapitalized uzi names
2015-06-17 19:26:02 -06:00
f47f9c83a5
Mobs that are anchored or buckled to something anchored no longer float in no gravity. This fixes the floating AI (at least when it's anchored).
...
Remove an istype check in mob/process_spacemove() since projectiles are no longer anchored objects.
2015-06-17 23:11:24 +02:00
ab103b54dc
Righted some checks.
...
If newcolor
2015-06-17 21:03:11 +01:00
f4cf6ffc95
Merge pull request #9978 from phil235/XrayGunNerf
...
Nerfs xray gun
2015-06-17 22:13:53 +03:00
3b93604fa5
Merge pull request #9791 from AnturK/hallucinations
...
New hallucinations
2015-06-17 20:50:20 +02:00
98c158f958
Merge pull request #9845 from AnturK/buttsender
...
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
e8537b80f3
Changing messages when using hivelord core for consistency, you're no longer eating it but applying it on yourself.
2015-06-17 20:15:36 +02:00
608486a919
Typo fix
2015-06-17 18:55:05 +01:00
ee87a1dc23
Merge pull request #9974 from phil235/MirrorRaceChangeFix
...
Mirror race change fix
2015-06-17 12:54:19 -05:00
1e55c8ac1a
Minor fixes
2015-06-17 18:59:28 +02:00
474633eb4e
Removes redundancy
2015-06-17 18:49:47 +02:00
0ec25187aa
Whisper Fixes and Buffs
2015-06-17 18:49:46 +02:00
afe0a10bb2
Merge pull request #9989 from optimumtact/patch-3
...
PSHOOM
2015-06-17 18:01:11 +02:00
556b25aec3
Added 9mm 2-burst 32 mag uzis that costs 40 influence. Unlike tommy guns gangs will be able to purchase ammo for uzis.
2015-06-17 09:36:15 -06:00
275bde00ef
Changed description slightly
2015-06-17 15:49:56 +01:00
bfb2345726
Moved combat shotguns to shotgun/automatic/combat
...
- shotgun/automatic/ will pump itself automatically on firing
- combat shotgun capacity nerfed to 6 rounds
- replaced all instances of the old path with the new one
2015-06-17 15:25:59 +01:00
58b436fe1f
adds abandoned crates to code, adds crate spawners to code, distributes crate spawners across maps
2015-06-17 09:07:28 -05:00
f976ae8a58
Merge pull request #9957 from MrStonedOne/boomboomshaketheroom
...
Makes the bomb cap a config option.
2015-06-17 14:17:09 +02:00
8820662c31
Merge pull request #9847 from Xhuis/ALL_HAIL_LORD_SINGULOTH
...
ALL HAIL GOD-EMPEROR SINGULOTH
2015-06-17 10:47:35 +01:00
f9d28fbe00
Buffs bulletproof vests back to 80
2015-06-16 19:44:20 -06:00
6b6ffe0314
Merge pull request #9972 from Dorsisdwarf/sudoku
...
Adds a suicide_act to pens
2015-06-16 13:39:37 -05:00
c177f99d63
Xray gun nerf is just the 15 tiles range.
2015-06-16 19:49:25 +02:00
56cd6d7140
Changes xray beam to have reduced damage instead of reduced range when hitting something.
2015-06-16 18:35:20 +02:00
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04:00
26d75cc5ba
Merge pull request #9863 from MrPerson/508_compilation
...
Makes the game compile in byond version 508
2015-06-16 19:38:11 +10:00
9a1c1ae7af
Merge pull request #9967 from Jordie0608/figurediwouldvemissedsome
...
Fixes computer icon errors
2015-06-16 11:30:44 +02:00
0bf6f09969
Merge branch 'master' of https://github.com/tgstation/-tg-station into whocodesthecodemen
...
Conflicts:
code/modules/admin/verbs/pray.dm
2015-06-16 17:24:20 +10:00
Ikarrus
Xhuis
oranges
palpatine213
Remie Richards
LaharlMontogmmery
Thunder12345
pudl
phil235
Cheridan
phil235
xxalpha
Razharas
AnturK
Jordie