6ef09bdbd8
Adds text for all antagonists
2015-06-30 01:15:28 -04:00
cb2043af82
Removes line of unused code
2015-06-29 23:47:18 -04:00
2cd02c5431
Antagonist popups
2015-06-29 23:44:21 -04:00
3b4dbc4f27
Merge pull request #10216 from nukeop/syndiesurgerybag
...
Add Syndicate surgery bag to uplink
2015-06-29 15:52:55 -05:00
8ad1c54d4e
Merge pull request #10221 from optimumtact/patch-5
...
Stop triggering myself when viewing fork code
2015-06-29 14:47:28 -05:00
7ce138afef
Merge pull request #9314 from AnturK/blob_examine
...
Adds blob toxin to blob description
2015-06-29 19:28:10 +02:00
5b5c03dd6b
Merge pull request #10234 from Ikarrus/spraycanerror
...
Gang Tweaks + Fixes
2015-06-29 20:24:16 +03:00
0bfe2a191b
removes leftovers
2015-06-29 19:02:51 +02:00
34434d6012
Merge pull request #10210 from Perakp/cameraFix
...
Fixes aliens slashing cameras
2015-06-29 18:53:59 +02:00
9b09a5115b
Increased recruitment cooldown to 3 minutes with bonus reductions at 30 seconds per head.
2015-06-29 08:46:11 -06:00
0ef4c29a89
Recruitment proc checks for the implant first before gang affiliation.
2015-06-28 22:01:01 -06:00
a5c4d4134d
New Gene tag by Joan +fixes
2015-06-28 20:11:29 -06:00
5fc029d63d
Merge pull request #10215 from Ikarrus/freetheclothes
...
[Box, Meta, Mini] Moves clothes from out of equipment lockers and into wardrobe closets
2015-06-28 18:16:04 -05:00
5a7d43aedd
Error message for trying use the spray can with the cap on
2015-06-28 11:18:29 -06:00
cbee684951
Macro/Micro bombs are now restricted to the Nuclear game mode.
...
Also fixes some broken spans.
2015-06-28 09:57:24 -06:00
fbafd72660
Pistol Ammo was lost in the conflict resolution
2015-06-28 08:32:33 -06:00
c08cfb8018
Merge branch 'master' of https://github.com/tgstation/-tg-station into gangnerf
...
Conflicts:
code/game/gamemodes/gang/recaller.dm
2015-06-28 08:30:00 -06:00
acca364c50
Merge pull request #10191 from Xhuis/thoseDogsAreSleepingByTheWay
...
Gang Fighting Styles
2015-06-28 17:22:38 +03:00
080156bba1
Merge pull request #10085 from phil235/AcidFix
...
Acids, Smoke, Foam, reagents reaction() refactors
2015-06-28 16:57:20 +03:00
ef9712be12
Polling instead of persistent.
2015-06-28 15:23:43 +02:00
e8d3deafab
Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidFix
...
Conflicts:
code/modules/clothing/masks/gasmask.dm
2015-06-28 15:22:21 +02:00
6c488b289a
Merge pull request #9885 from kingofkosmos/latheexofabspittingstuff
...
Autolathe produces items on top of itself
2015-06-28 16:16:31 +03:00
cad9b44264
Removes redundancy
2015-06-28 14:34:48 +02:00
20576bb71f
Adds blob toxin to examine
2015-06-28 14:34:48 +02:00
7dfcc292b7
add a variable to mmi to indicate if it's of the syndicate variety as
...
suggested
2015-06-28 12:44:25 +01:00
d8bc3acea2
Stop triggering myself when viewing fork code
2015-06-28 18:48:40 +12:00
518dc0e6b4
nvm it works
2015-06-28 03:06:56 +01:00
7aef172888
less retardation
2015-06-28 03:02:13 +01:00
0316a836cb
add a Syndicate surgery dufflebag full of tools to the uplink
...
add a Syndicate MMI that lets traitors create subverted cyborgs (not
slaved and with emag laws) - this is included with the surgery bag
2015-06-28 02:54:49 +01:00
8c62ccfe2e
Moves clothes from out of equipment lockers and into wardrobe closets
...
- Wardrobe closets are not locked, so it should make it a bit easier to steal disguises
- Unclutters equipment lockers
- Heads still have their one lockers for convenience, but some of the clothes have been removed if they're already in a department's wardrobe
2015-06-27 17:22:02 -06:00
119c4d7929
Merge pull request #10186 from Anonus/m(i/a)crobombs
...
M(i/a)crobomb Adjustments
2015-06-28 00:19:06 +03:00
352500d341
Sprites bo staff, adds custom martial art
2015-06-27 15:32:54 -04:00
df758c69b5
- cleans up camera deactivate()
...
- Aliens slashing cameras works now, fixes #10043
2015-06-27 22:13:18 +03:00
9591d2255d
Hoping this solves the merge conflict
2015-06-27 19:23:13 +02:00
436099550b
Additional Tweaks
2015-06-27 09:55:45 -06:00
6ab2eb78e0
Merge pull request #10155 from Ikarrus/shredme
...
Burnable Objects & Clothes [Ready]
2015-06-27 18:29:14 +03:00
59ca40f03d
Burning objects are processed every tick now instead of using a spawn() check
2015-06-27 09:22:14 -06:00
e6602cf123
Merge pull request #4 from tgstation/master
...
Merge with upstream
2015-06-27 10:27:43 +02:00
18098752ac
Gang Tweaks
...
- Gang Lieutenants can buy gang tools now, but at a higher cost than the original boss
- Gang leaders can register additional gangtools to themselves for use as spares.
- Number of maximum lieutenants lowered to 2
- Pistol cost increased to 25 influence
- Uzi cost increased to 50 influence
- Uzi Ammo decreased to 20 influence
- Overcoats added to items the biogenerator can produce.
- Domination attempts reduced to 2
- Gang dominator time bonuses cannot reduce it lower than 5 minutes
- Showers will clean off lipstick and face paint
2015-06-27 01:12:54 -06:00
6cc17a6243
Resolved Conflicts:
...
code/modules/clothing/clothing.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/suits/bio.dm
code/modules/clothing/suits/utility.dm
2015-06-27 00:17:02 -06:00
8759f56f6f
Squashed Commits
2015-06-27 00:09:16 -06:00
50c1fc487e
Merge branch 'master' of https://github.com/tgstation/-tg-station into jackit
2015-06-26 23:49:43 -05:00
16cdc39d2f
Converts the jacket to a cosmetic, added to autodrobe and clothesmate, doesn't spawn in closets anymore
2015-06-26 23:48:18 -05:00
1aac98a52a
Merge pull request #3 from tgstation/master
...
Merge with upstream
2015-06-27 05:01:13 +02:00
46d7fb9bbd
Merge pull request #10168 from phil235/FireaxecabinetFix
...
Fixes runtime with do_after()'s that don't use a target.
2015-06-26 20:12:15 -05:00
b9cdb3384a
Merge pull request #9932 from Jordie0608/mycomputerismadewithoverlayswhyisntyours
...
Icon and code improvements to fancy storage, cigarette packs, lighters, droppers and syringes
2015-06-26 15:34:24 -05:00
c5a47adb64
Fighting Styles, 1
2015-06-26 14:19:52 -04:00
ee13658752
Merge pull request #10018 from pudl/sam
...
Abandoned Crates (Ported from Baystation12)
2015-06-26 19:07:58 +02:00
2e61607d3f
Merge pull request #10105 from xxalpha/chief
...
Cleaned some clothing flags.
2015-06-26 19:03:13 +02:00
a7a0d6eca7
nobody saw anything
2015-06-26 12:44:01 -04:00
Xhuis
Cheridan
phil235
Razharas
AnturK
Ikarrus
AnturK
phil235
barackobama
Orange Borg
Perakp
LaharlMontogmmery
nullquery
TheVekter
Anonus