Commit Graph

1776 Commits

Author SHA1 Message Date
Markolie
a70c06b7b7 Welding closet 2014-12-14 02:10:12 +01:00
Markolie
b4db3ca710 Inflatable wall box change 2014-12-14 01:02:51 +01:00
Markolie
6d3f0e8bf4 Bug fixes 2014-12-13 18:59:04 +01:00
Markolie
e31886016b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/objects/structures/window.dm
2014-12-13 02:15:05 +01:00
Markolie
37b86cd8f1 Xenos gamemode rework 2014-12-13 02:08:22 +01:00
Fox-McCloud
e76c8f26f3 Stamina 2014-12-12 06:52:20 -05:00
Markolie
b8282b7cae Blueshield/NT Rep/NT Rec updates 2014-12-10 06:09:06 +01:00
Markolie
7359061678 Bug fixes 2014-12-10 04:47:24 +01:00
Fox-McCloud
4868d3795d Vox and Space 2014-12-09 03:47:46 -05:00
SamCroswell
2d1f82f94e VERY Minor Map Fixes, Bug Fixes
The plating in the maintenance bar now has the correct icon when given
tiles.

Borgs can no longer add their modules to carts.

The hand teleporter now recharges properly again.
2014-12-05 19:08:36 -05:00
Fox-McCloud
2957d22caf Merge pull request #25 from SamCroswell/master
Minor Security Update
2014-12-01 21:36:46 -05:00
SamCroswell
55e55e7c91 Minor Security Update
- Fixes seclite inhand, updates to the newer seclite icon.
- Corporate security outfits now spawn with the rest of the security
wardrobe.
2014-12-01 21:15:27 -05:00
Fox-McCloud
3e321cf360 Merge pull request #20 from SamCroswell/master
Head of Security Items Update
2014-12-01 06:28:18 -05:00
SamCroswell
b2dee687aa Head of Security Items Update
- HoS jacket can now be buttoned or unbuttoned with a verb.
- The HoS now only gets the jacket and hat he spawns with.
( I verified the HoS spawns with a jacket and hat no matter if they
latejoined or were HoS from the start of the shift)
2014-11-30 22:22:01 -05:00
Fox-McCloud
e082c441f0 False Wall Fixes 2014-11-30 21:45:37 -05:00
Markolie
c7acac268a Map fixes, hydroponics wrenching fix, adds satchel to scientist's locker 2014-11-30 22:03:44 +01:00
Fox-McCloud
9a391827b6 Shotgun and Sprite Updates 2014-11-30 00:09:47 -05:00
Markolie
0dc52900cc Adds the service channel (:v) 2014-11-29 21:01:19 +01:00
Fox-McCloud
3b884622c5 Job Changes 2014-11-29 09:10:31 -05:00
Markolie
ae8f08e2b8 Fixes reflection, various security level fixes, gamma armory update, communication console fixes 2014-11-29 02:05:42 +01:00
Markolie
3b1dc8e487 Merge branch 'master' of https://github.com/ZomgPonies/Paradise
Conflicts:
	icons/obj/weapons.dmi
	maps/cyberiad.dmm
2014-11-27 21:39:01 +01:00
Markolie
b66f3effae Bug fixes, implements new copying/faxing system from Bay 2014-11-27 21:00:58 +01:00
SamCroswell
8b16d394ed Projectile Laser Update
Lasers are now projectiles instead of instant beams. Fire delay removed,
damages adjusted accordingly.
2014-11-26 19:16:21 -05:00
Markolie
dd70ba2030 Adds a psychiatrist's locker to the psychiatrist's locker, with a straight jacket, syringe and a pill bottle with 2x Citalopram and 2x Methylphenidate 2014-11-22 20:58:26 +01:00
Markolie
c0f1c92bef Windoor damage fix, allows deconstruction of windoors 2014-11-22 06:48:51 +01:00
Markolie
107325bb43 Melee attack for mechs 2014-11-22 06:05:13 +01:00
Markolie
2c2c7fc517 Constructable Phazon, constructable display case 2014-11-22 05:15:44 +01:00
Markolie
dd3739119e Properly document harmbatonning removal, window update check 2014-11-20 00:55:26 +01:00
Markolie
e2e996fbbf Glass now changes color when built based on the area, map fixes 2014-11-20 00:08:29 +01:00
Markolie
2f7d3ae26d Additional constructable and upgradeable machines, adds soap to drones, updates teleporter 2014-11-18 03:13:12 +01:00
Markolie
b2d0e26a6d Add meson goggles to atmos lockers, add alert camera monitors to engineering 2014-11-14 15:55:38 +01:00
Fox-McCloud
f84ca26012 Fixes and Stuff 2014-11-11 22:48:08 -05:00
Fox-McCloud
111b24ceb8 Janitor Rework 2014-11-10 03:17:56 -05:00
SamCroswell
46793a2c04 Poker table fix, two handed fix, Nukeops naming
- Poker tables now actually use the poker table icon. I don't reccomend
you use this, as the poker table icon doesn't mesh well as of right now.
Plan to fix that at a later date.

- Items that require two hands now properly update when
wielded/unweilded. Hooray.

- Minor changes to the way nukeops naming works.
2014-11-09 21:37:14 -05:00
Fox-McCloud
6dfc1f4d70 Merge pull request #482 from SamCroswell/master
Nukeops Update
2014-11-08 11:05:51 -05:00
Fox-McCloud
bf867da403 Merge pull request #469 from Nienhaus/master
Adds EngiCart
2014-11-08 10:58:25 -05:00
SamCroswell
722fd6a1e0 Nukeops Update
- Gave the nukeops leader the ability to choose the name of their team.

- Gave the Bulldog an in-hand icon identical to the c20r until we can
figure out how to add left hand right hand icons without breaking
everything.

- Added a helmet for the Syndicates, identical to the helmet they
already had with a special icon.

- Replaced the SWAT helmet they had in their lockers with the new Syndi
helmets.
2014-11-08 10:51:20 -05:00
Fox-McCloud
bf93e9caaf Jetpacks for Sydnies! 2014-11-08 01:15:46 -05:00
Nienhaus
25a92c91fd Ports the TG style Jani Cart. 2014-11-07 22:48:44 -06:00
Nienhaus
6cfd8b7076 Adds EngiCart
http://i.imgur.com/18w9fkq.png Can hold three toolboxes, metal, plasteel, glass, tape, and a flashlight.
2014-11-07 19:18:48 -06:00
Fox-McCloud
e1c83d7f55 Nuke-Ops-Final 2014-11-06 07:29:16 -05:00
Fox-McCloud
9b6dc5cdb5 Merge pull request #458 from Markolie/master
Magistrate/Psych Office shutter fixes, telescience console UI update, camera fixes, borg movement fix, security windoor fix, CentComm identification computer fix, locker fixes
2014-11-06 03:18:14 -05:00
Markolie
f150cabd19 Lockers can now be closed if they are in front of a fireaxe cabinet (or any other closet object which is anchored and as such can not be stored). 2014-11-05 18:29:05 +01:00
Markolie
3c6c11c22d Also prevents lockers from being (un)welded from inside. 2014-11-05 18:09:47 +01:00
Fox-McCloud
dd200af4bf Nuke Ops Rework Phase 2 2014-11-05 06:56:46 -05:00
Fox-McCloud
650c9a3e3c Nuke Ops Rework Phase 1 2014-11-03 23:45:00 -05:00
Markolie
69aad225d0 Fix space. 2014-11-04 03:14:35 +01:00
Markolie
a0abc79368 Personal lockers can no longer be locked from the inside. Also fixes the "It won't budge" message which kept appearing. Per https://github.com/ZomgPonies/Paradise/issues/452. 2014-11-04 03:13:03 +01:00
Fox-McCloud
c879ead4f7 Music Updates 2014-10-31 21:55:25 -04:00
Fox-McCloud
f77eb5c914 Traitor Gear and Balance 2014-10-28 01:35:03 -04:00