95b2cc2b09
Merge pull request #10092 from TheVekter/dangerwillrobinson
...
Danger Update: Meteors, Rods, Flux and Grav
2015-06-23 03:39:41 +01:00
969cb41668
FUCK
2015-06-22 21:33:37 -05:00
ab4a0ade28
fixed the changelog FOR REAL THIS TIME, also fixed bad coding
2015-06-22 21:30:50 -05:00
e2da971040
hurr fucking durr changelog fix
2015-06-22 21:03:14 -05:00
3f57259c69
Merge pull request #9466 from Fayrik/TheNanoing
...
The Nanoing (Episode 2: The Fix Wars)
2015-06-22 14:24:20 +02:00
4ec23215c9
ermahgerd chenglerg
2015-06-22 01:28:41 -05:00
e6b738734a
Merge pull request #8876 from xxalpha/fixfixfix
...
Cyber Implants + (Pt.2)
2015-06-21 22:12:17 +03:00
58301912e2
This was way too much work, so this had better work now.
2015-06-21 20:04:16 +01:00
dfd4fcb927
compiled
2015-06-22 22:41:36 +10:00
c79963f7b7
Merge pull request #9792 from GunHog/AI_STOLE_MY_BIKE
...
Malf AI module changes + Mechs for normal AIs!
2015-06-21 00:30:03 +01:00
a921431365
Changelog update
...
Correctly reflects the cost change to 30 CPU.
2015-06-20 13:35:36 -05:00
05f65f04b8
Merge pull request #9866 from Xhuis/revenants
...
Revenant Rework (NOW WITH LESS CLOSING)
2015-06-20 13:24:02 -05:00
859c5e66e0
Merge pull request #9930 from duncathan/givinunarysomelovin
...
Brings some unary devices closer to the present
2015-06-20 20:14:02 +02:00
f123908116
Automatic changelog compile
2015-06-20 12:30:22 -04:00
7929b7dcd7
Merge pull request #10031 from Ikarrus/gangfashion
...
Gang Update: Fashion War Edition
2015-06-20 18:06:19 +02:00
a2948ba203
Merge pull request #9956 from Jordie0608/whocodesthecodemen
...
Various admin improvements
2015-06-20 00:53:30 -05:00
b89602c972
Squashed commits
2015-06-19 18:45:46 -06:00
2823a98244
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-19 11:23:45 -04:00
e4281bbaab
Merge pull request #10019 from Thunder12345/autoshotgun
...
Moved combat shotguns to shotgun/automatic/combat
2015-06-19 17:06:00 +02:00
1dde070d18
Merge pull request #9800 from Dorsisdwarf/wittybranchname
...
Buffs nuke ops [merge ready]
2015-06-19 12:00:23 +02:00
e27cdc7efe
Resolved Conflicts:
...
code/game/gamemodes/gang/dominator.dm
2015-06-18 23:05:51 -06:00
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
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
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
470f21a752
Merge pull request #10004 from Ikarrus/gangimplants
...
Gang Update: Loyalty Implant Edition
2015-06-18 10:41:15 -05:00
ebe9ff4afc
Automatic changelog compile
2015-06-18 08:54:20 -04:00
f4cf6ffc95
Merge pull request #9978 from phil235/XrayGunNerf
...
Nerfs xray gun
2015-06-17 22:13:53 +03:00
98c158f958
Merge pull request #9845 from AnturK/buttsender
...
Adds PDA-Message Photo Attachment
2015-06-17 20:36:52 +02:00
cb8dc379dc
Fixes changelog
2015-06-17 19:18:41 +01:00
64dabb50da
Merge pull request #9939 from Miauw62/EyeAye
...
Several further tweaks to AI camera balance.
2015-06-17 19:58:06 +02:00
a372b6ffc7
Merge pull request #9940 from Ikarrus/deptmanagement
...
[Boxstation Edit] Department Management Console
2015-06-17 19:46:44 +02:00
45f039d12b
Added changelog
2015-06-17 18:26:37 +01: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
8820662c31
Merge pull request #9847 from Xhuis/ALL_HAIL_LORD_SINGULOTH
...
ALL HAIL GOD-EMPEROR SINGULOTH
2015-06-17 10:47:35 +01:00
c177f99d63
Xray gun nerf is just the 15 tiles range.
2015-06-16 19:49:25 +02:00
ead218ca8e
updating changelog
2015-06-16 18:38:57 +02:00
3bc466a0ff
Merge remote-tracking branch 'remotes/upstream/master' into thaw
2015-06-16 11:42:47 -04: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
34fb8cc8bc
toggle nuke and set sec level button, flamethrower logging
2015-06-16 17:19:56 +10:00
8ebdcd9126
Removed tommy guns from gang
2015-06-15 23:29:37 -06:00
bd14e72dca
- Fixed a bug where announcements were being made for destroying dominators that haven't been turned on
...
- Added a changelog
2015-06-15 22:11:15 -06:00
841765e4f4
Automatic changelog compile
2015-06-15 23:22:16 -04:00
63a68a97b2
Nerfs xray gun by giving it a shorter range that gets shorter if it hits things.
...
Make vault airlock more explosion resistant (explosion_block var).
2015-06-15 20:53:28 +02:00
fd27d9d3bb
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/gamemodes/malfunction/Malf_Modules.dm
2015-06-15 12:26:28 -05:00
bc11259282
Merge remote-tracking branch 'remotes/upstream/master' into AI_STOLE_MY_BIKE
...
Conflicts:
code/game/machinery/computer/aifixer.dm
2015-06-15 11:27:11 -05:00
ce933a1a97
Slaughter Demon (again)
...
Had to recreate because I couldn't resolve the merge conflict.
New side event/antagonist. Simple animal that can use pools of blood as
portals to move around the station. Spooky scary.
-CtrlClick on an adjacent blood pool (or turf with blood on it) to
"enter" (start an infinite duration jaunt
-CtrlClick on a blood pool while jaunted to exit at that pool
-If you're pulling a mob while you enter a pool, the mob gets pulled in
with you, and you devour them, healing yourself
-Night vision
Adds an event (admin only) that spawns one.
Adds wizard item for summoning it. Has objective to kill the wizard (and
everyone else).
Also fixes typo/filepath for the scrying orb in the new wizard datum
thing.
If someone could help me with mind stuff so I can track how many people
it eats that'd be great.
Webm
http://www.singulo.io/tg/src/1433549232359.webm
2015-06-15 09:41:03 -05:00
8946c9adbf
Changelog
2015-06-15 10:53:44 +02:00
ec8cd61d4c
Merge pull request #9808 from Incoming5643/march_of_the_snowflakes
...
WJohn's Hyper Customizable Lizard Sprites
2015-06-14 17:40:20 -05:00
Remie Richards
TheVekter
phil235
Razharas
Fayrik
Jordie0608
GunHog
Cheridan
Swag McYolosteinen
sybil-tgstation13
Ikarrus
Xhuis
Thunder12345
phil235
GunHog
KorPhaeron
AnturK