Zuhayr
d79af13a2c
Resolving bugs with the game mode refactor.
2015-03-21 11:08:21 +10:30
Zuhayr
98da191ac3
Gamemode refactor, lots of code shuffles, PR will have details.
2015-03-21 11:08:17 +10:30
PsiOmega
7ab57a4917
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/storage/fancy.dm
code/modules/mob/living/carbon/human/life.dm
2015-03-20 08:44:52 +01:00
PsiOmega
3d9d05afce
Fixes #8107 .
...
The announcer again has its given name, rather than a randomly selected one.
The announcer now states its business, rather than talks about it.
The announcer now uses the proper frequency.
2015-03-19 21:33:58 +01:00
PsiOmega
1f5de7f64f
Ports /tg/ & Paradise ghost sight.
...
Ghosts can now toggle darkness and seeing ghostly things independently.
Includes some extra work to allow observers to see AI eyes while (mostly) preventing cultists from doing the same.
2015-03-19 16:14:02 +01:00
Chinsky
d2518798ec
Merge pull request #8486 from PsiOmegaDelta/NanoLaws
...
NanoUI - Silicon law manager
2015-03-17 14:24:30 +03:00
Chinsky
376657bdd7
Merge pull request #8353 from Glloyd/goonschedu
...
Goon Process Scheduler for BS12
2015-03-17 10:04:21 +03:00
PsiOmega
7f68403ae4
NanoUI - Silicon law manager
...
NanoUI interface for viewing silicon laws, accessible to both the silicon and admins.
Malf AIs and admins may also add, edit, and remove laws.
2015-03-17 07:22:02 +01:00
Chinsky
149bf70e3e
Soulstones now require victim to actually be dead or maimed, as message says, instead of just sleeping.
...
Also shades now get their former icon and stuff like ghosts, for maximum spooky.
2015-03-13 13:16:59 +03:00
Zuhayr
e0f23aead5
Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.
2015-03-11 21:17:51 +10:30
PsiOmega
57c0591283
Fixes ninja spawn logic.
...
Fixes the logic I re-made after a PR comment without double-checking it.
Changes ninjastart to use the actual landmarks instead of locs for consistency.
2015-03-09 19:22:07 +01:00
Chinsky
36233b72e2
Merge pull request #8367 from mwerezak/cult-conversion
...
Improves cult conversion
2015-03-06 11:57:03 +03:00
mwerezak
32ee4d57dd
Improves cult conversion
...
Now uses a continuous damage system, dealing damage once every 100 ticks (~10 seconds).
Also improves effects dealt when resisting conversion.
2015-03-05 23:58:56 -05:00
Graham Lloyd
160183ebd5
finishes work on adapting the goon process scheduler for BS12.
2015-03-04 05:14:36 -05:00
PsiOmega
7e498e1cf7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/hydroponics/seed_datums.dm
code/modules/hydroponics/trays/tray_apiary.dm
code/modules/power/apc.dm
code/setup.dm
2015-02-27 09:06:48 +01:00
mwerezak
ec59f8ab07
Fixes captain's laser gun
...
Also updates retro laser gun path, as it isn't really conceptually
related to the carbine anymore, and should avoid inheriting things like
fire rate.
2015-02-25 23:35:20 -05:00
mwerezak
944be58804
Adjusts sniper rifle damage
...
Lowers wall pierce chance back to original value to compensate, and
increase the cost of ammo by 1 TC.
2015-02-24 20:45:40 -05:00
PsiOmega
afb7f7eff7
Fixes #8223 .
...
Restores a lost, somewhat important, line.
Fixes a duplicate uplink item reference.
2015-02-24 12:27:03 +01:00
PsiOmega
1fd70d03b1
Fixes Malfuction Turret Upgrade
...
Now upgrades all portable turrets on the station, instead of turrets found in the player list.
Decreases delays between shots, instead of increasing it, to 66% of original delay.
2015-02-24 08:28:15 +01:00
Zuhayr
ee0d63a43d
Merged with dev.
2015-02-24 17:03:39 +10:30
PsiOmega
c55f807b42
Removes random Telecrystal grants, instead increases the start amount by 2.
2015-02-23 20:56:48 +01:00
PsiOmega
b38d8495b3
Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather
...
Conflicts:
code/game/gamemodes/game_mode.dm
code/modules/clothing/spacesuits/rig/suits/merc.dm
2015-02-23 17:38:50 +01:00
PsiOmega
5be726753f
Updates paths after the projectile update. Adds rig modules to the uplink.
2015-02-23 17:33:12 +01:00
mwerezak
115bbbe669
Nerfs merc sniper rifle and makes it uplink purchasable
...
Also reduces the Z8's damage a bit, just to make it more in line with
the new bullet damage ranges.
2015-02-22 20:27:06 -05:00
Zuhayr
2139884244
Dev merge.
2015-02-21 19:49:47 +10:30
PsiOmega
0b9406a089
Merge remote-tracking branch 'upstream/dev' into SuppliesOfTheGodfather
2015-02-21 10:17:17 +01:00
Chinsky
214324eaaf
Merge pull request #8156 from PsiOmegaDelta/CameraMove
...
Custom ninja spawn points.
2015-02-21 11:43:19 +03:00
PsiOmega
18521e6983
Now possible to order a kit with a random toxin and syringe - 4TC
2015-02-20 21:13:34 +01:00
PsiOmega
958391d06b
Custom ninja spawn points.
...
The ninja should no longer risk spawning far away from the station, with no clue where to go to reach it.
2015-02-18 08:14:40 +01:00
mwerezak
57ffdc82f6
Replaces stool structures with stool items
2015-02-18 01:06:00 -05:00
Zuhayr
9c45f000ec
Merge with dev.
2015-02-16 20:34:07 +10:30
mwerezak
08635587e1
Fixes revolver paths, span classes, typo. Cleans exodus-1.dmm
...
Tweaks syringe gun and dart gun, renames syringe gun cartridges and makes them printable.
Adjusts penetration so that passing through mobs happens with a probability that scales with damage.
Adds a .45 signal pistol to the HoP's closet and a 9mm one to the mercenary shuttle.
2015-02-14 13:38:05 -05:00
PsiOmega
4c20beac43
Adds a surgical kit for 3TC. Contains only tools, no medication.
2015-02-14 11:47:49 +01:00
Zuhayr
5e87b21d44
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-14 09:32:17 +10:30
PsiOmega
3fb34237ee
Additional uplink items.
...
Adds the syndicate radio channel encryption key for 2TC.
Adds a trash bag to the Smooth operator (9mm+silencer) kit.
2015-02-13 13:22:12 +01:00
mwerezak
0d89717cf2
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/projectile/pistol.dm
2015-02-13 01:57:19 -05:00
Chinsky
9dd282e43b
Merge pull request #8105 from PsiOmegaDelta/SyndicateDedLongLiveSyndicate
...
New traitor items
2015-02-13 08:22:28 +03:00
PsiOmega
f8c5cf8f83
Adds a kit with cigarette packs and zippo lighter.
...
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
2015-02-12 16:35:49 +01:00
Zuhayr
c953e279a4
Update from dev.
2015-02-12 23:15:47 +10:30
Zuhayr
a8089d4437
Merge master into dev.
2015-02-12 23:01:08 +10:30
PsiOmega
cb82dd950e
Adds a floppy disk which provides access to the station camera network given appropriate hardware.
2015-02-12 12:20:58 +01:00
mwerezak
5740f52964
Merge branch 'guns' into gun-rewrite
...
Conflicts:
code/modules/clothing/suits/armor.dm
code/modules/clothing/under/ties.dm
code/modules/projectiles/gun.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/energy/pulse.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/projectile.dm
code/modules/projectiles/guns/projectile/automatic.dm
code/modules/projectiles/guns/projectile/launcher.dm
code/modules/projectiles/guns/projectile/shotgun.dm
2015-02-11 18:08:43 -05:00
Zuhayr
08b26e8e4c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-11 14:35:58 +10:30
mwerezak
ab6f0bf30c
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/clothing/under/ties.dm
code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
PsiOmega
3a6c4dacd6
Adds 9mm gun with silencer, 5TC, with the option to acquire additional ammo, 2TC.
2015-02-10 22:39:40 +01:00
PsiOmega
dcb2e22e61
Adds a concealed cane sword for 2 TC.
2015-02-10 22:37:25 +01:00
PsiOmega
d0a59bcd03
Adds a health section in the uplink.
...
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
2015-02-10 21:29:29 +01:00
PsiOmega
02dc9e3008
Lightly boosts the clerical kit.
...
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
2015-02-10 20:12:32 +01:00
PsiOmega
8ceaa8b5a1
Traitors can now order a spy kit
...
Traitors can now order a spy kit containing 3 camera+radio bugs + a monitor for 2 telecrystals.
2015-02-10 19:33:02 +01:00
PsiOmega
86c4e28326
Sorts uplink items by cost, then name.
2015-02-10 12:21:06 +01:00