d6741236b5
Merge pull request #8991 from Fayrik/AllTheSmallThings
...
One-Click-Antag Tweaks: Now with more jobbans!
2015-04-17 09:30:08 -05:00
83a68d0b5c
compiled
2015-04-16 19:08:46 +10:00
c556ff3843
edits
2015-04-16 19:08:25 +10:00
210eedbb48
Merge pull request #8841 from GunHog/Bot_Radio_And_Newscasters
...
Bot fixes and PDA upgrades!
2015-04-16 18:18:44 +10:00
772b05d56b
New Jobbans, and proper messages for when you fail to spawn antags.
2015-04-15 20:27:44 +01:00
a9002da949
Merge pull request #8776 from Xhuis/its_time_for_slimeperson_on_slimeperson_action
...
Adds an additional effect to green slime cores
2015-04-15 08:53:55 -05:00
6c1117c14d
Merge pull request #8958 from Incoming5643/excuse_me_while_I_vent_a_bit
...
buffs head slugs a bit
2015-04-15 13:01:58 +02:00
baf3c06171
Merge pull request #8957 from MrStonedOne/I-spent-five-minutes-trying-to-think-up-a-branch-name-and-all-I-got-was-this-lousy-excuse-of-one
...
Admins can now drag ghosts to mobs to put that ghost in control of that mob
2015-04-15 12:24:13 +02:00
e7d62ee356
Adds changelog for admin ghost drag
2015-04-15 03:00:07 -07:00
68849b9c8e
Adds ling control to the head slug
...
Adds a changelog!
2015-04-13 21:44:54 -04:00
e949c8ec6d
Changelog
2015-04-13 19:17:36 -04:00
3a7a300081
Merge pull request #8155 from AnturK/abduction
...
Abduction Gamemode [Ready]
2015-04-13 18:06:55 +01:00
6fa8e5f02d
Adds Abduction Mode
2015-04-13 18:40:15 +02:00
8782964774
compiled
2015-04-13 18:48:18 +10:00
c2a9d11f00
adds edits
2015-04-13 18:48:01 +10:00
d8ef9ecb44
Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
...
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
ffd0db2b7b
Merge pull request #8581 from MrPerson/lighting_2015
...
Object based lighting system
2015-04-12 13:14:32 +02:00
a0efcfe11e
Fixed changelog.
2015-04-11 22:40:50 +01:00
6f357b1d63
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem
2015-04-11 22:11:10 +01:00
853009f7e0
Merge pull request #8157 from Xhuis/shadowling_gamemode
...
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
c9338f7212
Shadowling: RELEASE EDITION
2015-04-11 11:42:02 -04:00
075328fa62
Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem
2015-04-11 14:40:35 +01:00
bfbc7c40a8
Should be up to date now.
2015-04-11 14:39:37 +01:00
c925e8019e
Merge pull request #8802 from Zelacks/defibModify
...
Removes the minimum damage requirement for defibs
2015-04-11 15:26:05 +02:00
296408d4ce
compiled
2015-04-11 17:38:12 +10:00
7a8f5436ee
edits and adds
2015-04-11 17:37:42 +10:00
e1f3ef6aaf
Merge pull request #8860 from GunHog/Maybe_Now_Cargo_Will_Mail_Things
...
Grants Cargo Technicians access to the Ore Redemption Machine!
2015-04-11 16:56:32 +10:00
0e0f8c4720
Fixed code, carp won't attack owner, corrected spelling.
2015-04-11 03:48:08 +01:00
5761ccde0a
Merge pull request #8794 from phil235/KineticAcceleratorNerf
...
Nerfs the kinetic accelerator.
2015-04-10 13:56:08 -05:00
04f3fbe9b1
Merge pull request #8807 from phil235/HolopadSpamFix
...
Holopad spam fix
2015-04-10 13:37:27 -05:00
a6776eaf68
Offers blood to Jordie
...
Changelog!
2015-04-09 18:17:08 -05:00
4ef5aa93dc
Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
...
Conflicts:
icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
13baa6e3cb
Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf
...
Conflicts:
code/modules/projectiles/projectile/special.dm
2015-04-09 17:27:55 +02:00
ddb5ffe324
Merge pull request #8582 from Xhuis/two_devices
...
Adds pizza bomb
2015-04-09 12:58:57 +02:00
a124048c77
compiled
2015-04-09 14:29:56 +10:00
6e59945a93
adds fixes
2015-04-09 14:29:39 +10:00
3f762ee6b5
PDA Upgrade and Bot Fixes
...
-The Captain's PDA can now access multiple bots!
- The Captain and HoP PDAs can now also remotely access Newscasters!
- Bot radio code now no longer uses filters to allow for multi-access
radio control.
- Bots can now patrol while off station.
2015-04-08 20:12:01 -05:00
e6e0143ec5
Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
...
Conflicts:
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/MiniStation/z2.dmm
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
f537b43108
Merge pull request #8789 from phil235/BeartrapFix
...
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
7df5998740
Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma.
2015-04-08 03:44:56 +02:00
380990ee31
CHANGELOG 4 REAGENT DECALS 2DAY
2015-04-07 17:30:38 -07:00
a98b558488
Adding changelog for real now...
2015-04-07 20:20:52 +02:00
e11a405165
Fixes the holopad choice window spam. The holopad now uses the standard popup window used by computers and most machines. A simple click to close it.
...
Fixes /obj/item/clothing/suit/space/pirat hiding the mob's jumpsuit when worn.
2015-04-07 17:44:43 +02:00
bc0bc0d57e
yml
2015-04-07 18:56:33 +08:00
0bbe748a03
Added changelog.
2015-04-06 03:33:03 +01:00
2e312cb510
Adds unstable mutation toxin
2015-04-05 22:02:41 -04:00
f9f618d699
Adding the chemical reactions and recipes for the new recipes.
...
Changes the glasses of what? to use an overlay with reagents color.
Adding a ricepack to the kitchen cabinet and the food crate.
Adding more bowl to the dinnerware vending machine.
Adding pumpkinjuice, blumpkingjuice, cherryshake, bluecherryshake pumpkin latte, drunken blumpkin reagents.
2015-04-04 19:29:12 +02:00
c62f594009
compiled
2015-04-04 22:29:10 +11:00
7c66c621d9
adds yml
2015-04-04 22:27:53 +11:00
3bb6cc8af9
Merge pull request #8625 from xxalpha/cyberplus
...
Cyber Implants +
2015-04-04 20:57:48 +11:00
Cheridan