Commit Graph

17409 Commits

Author SHA1 Message Date
mwerezak
bf24ac82b8 Removes IsHandgun() proc, adds slot flag 2015-02-10 20:25:41 -05:00
mwerezak
47a1639b6d Adds removing single casings, runtime fix 2015-02-10 19:54:54 -05:00
mwerezak
ee894d6b99 Flash projectile adjustment
Adjusts brightness, adds some effects, adds 9mm flash rounds and pistol
variant.
2015-02-10 19:54:30 -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
0daf1c2539 Merge remote-tracking branch 'upstream/dev' into SyndicateDedLongLiveSyndicate 2015-02-10 21:32:45 +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
Chinsky
d1de94c70e Merge pull request #8082 from Kelenius/ofMachinesAndParts
Update for machine upgrades and some science
2015-02-10 23:24:19 +03: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
Kelenius
1368707150 Borg charger now uses cell 2015-02-10 14:39:54 +03:00
PsiOmega
86c4e28326 Sorts uplink items by cost, then name. 2015-02-10 12:21:06 +01:00
PsiOmega
005f8ef405 Adds passive aggressive NanoTrasen balloon. 2015-02-10 12:17:25 +01:00
PsiOmega
93a479099a Air alarm deconstruction fix.
Air alarms can again be deconstructed, at the price of lost convenience.
2015-02-10 10:35:45 +01:00
PsiOmega
cd5a2fc52e Bonus: Makes the tinted windows respect power failures. 2015-02-10 10:16:58 +01:00
Chinsky
712b952985 Merge pull request #8089 from GinjaNinja32/pai
NanoUI pAI, more modular pAI software
2015-02-10 10:05:20 +03:00
Chinsky
4f1afb3747 Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping
[Ready for Merge] Custom Item Update/Addition
2015-02-10 09:23:47 +03:00
Chinsky
ec6278f028 Merge pull request #8097 from mwerezak/projectile-fix
Fixes errors introduced by merge
2015-02-10 09:23:09 +03:00
PsiOmegaDelta
79aacd9f30 Merge pull request #8081 from comma/maximumtrinkets
Accessories update.
2015-02-10 06:51:30 +01:00
PsiOmegaDelta
973bc1c0f3 Merge pull request #8071 from RKF45/newpaint
Generic Paint II: Fun with Paint
2015-02-10 06:48:32 +01:00
Zuhayr
ffc05aecfa Merge pull request #8091 from PsiOmegaDelta/Cleanit
Minor cleanup in setup.dm
2015-02-10 13:41:16 +10:30
mwerezak
5ddbbc0371 Fixes ammo_magazine icon states being handled incorrectly. 2015-02-09 21:35:37 -05:00
mwerezak
fc6dfb5f1b Ammo magazine and casing update
Rewrites ammo magazines and casings to be a bit more logical.
Updates gun/projectile and all subtypes to work with the new ammo code.
2015-02-09 21:32:49 -05:00
MrSnapwalk
05f14ccd84 Updates /obj/item/clothing/under/fluff/parkereliza and adds /obj/item/clothing/suit/fluff/parkereliza to the code. 2015-02-09 19:34:43 -06:00
mwerezak
d8a8384c41 Fixes errors introduced by merge
Fixes errors introduced by commit
fac32d07e9.

Grabbed the version of projectile.dm from the parent commit and changed
the paths by hand (again).
2015-02-09 17:53:47 -05:00
Chinsky
1c4734c4e3 Merge pull request #8088 from Raptor1628/dev
Paramedic Job Fixed
2015-02-10 01:00:08 +03:00
Chinsky
4deeebfe3e Merge pull request #8093 from GinjaNinja32/pai_pulling
Fixes pAIs being spammed with "You are too small to pull that." when being pulled
2015-02-09 19:52:32 +03:00
Chinsky
ae54b2efc2 Merge pull request #8092 from GinjaNinja32/webbing
Fixes webbings utilising bluespace storage for infinite storage
2015-02-09 18:26:19 +03:00
D Anzorge
93f3b5b72a Fix a bug in isNotStationLevel() helper 2015-02-09 09:38:48 -05:00
GinjaNinja32
503eb679cc Fixes pAIs being spammed with "You are too small to pull that." when being pulled 2015-02-09 13:32:42 +00:00
Zuhayr
ec6bb08a58 Merge pull request #8012 from SkyMarshal/icarus
Adds two admin weapons and refactors wall damage code.
2015-02-09 22:25:22 +10:30
GinjaNinja32
42bd4e7fba Storage accessory w_class raised to 3, typo fix 2015-02-09 11:15:19 +00:00
GinjaNinja32
70094884ff Fixes, code cleanup, adds the messenger I forgot last night 2015-02-09 10:41:08 +00:00
PsiOmegaDelta
ec1fe5edc7 Merge pull request #8090 from comma/master
Fixes #8009
2015-02-09 08:38:50 +01:00
PsiOmega
e1e5d993dd Minor cleanup in setup.dm
Fixes #8074.
2015-02-09 08:27:38 +01:00
Chinsky
2f52020ce4 Fixed backwards check 2015-02-09 08:26:45 +03:00
Chinsky
5496c7bbf0 Fixes #8009
Fixed flaslights producing infinite light/
2015-02-09 08:05:24 +03:00
GinjaNinja32
538ee11cb1 pAI rework 2015-02-09 01:58:54 +00:00
mwerezak
a679d22db8 Cleaner click parameter handling 2015-02-08 19:42:18 -05:00
mwerezak
9e62e08d2e Absolute paths 2015-02-08 19:39:41 -05:00
Raptor1628
76f4001cc1 Paramedic Job Fixed
Adds Paramedic job as outlined on the forums. Reduces MD access to EVA,
adds some minor EMT clothing stuff, and fixes #8020 and the medgreen
armband while I was piddling around in sprites.
EMT alt title and indent fixed.

Now less broken.

![](http://i.imgur.com/vOSoJy0.png)
2015-02-08 17:23:02 -05:00
GinjaNinja32
4495f4c8ed Fixes possible href exploit with APCs 2015-02-08 19:58:28 +00:00
PsiOmega
91b971b223 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-08 20:29:03 +01:00
Kelenius
e6dc9d36fd Update for machine upgrades and some science
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
SkyMarshal
a78ef81712 To make PsiOmegaDelta happy
I hate this format.  Bluh bluh huge bitch
2015-02-08 04:04:06 -07:00
SkyMarshal
c8d6214657 Fix indent thing for pointdefense 2015-02-08 04:03:19 -07:00
SkyMarshal
84c40171e7 The icarus gun now acts as a spotter. The Icarus can now be fired via adminverbs. 2015-02-08 04:03:19 -07:00
SkyMarshal
dadea3c7fa Adds two admin weapons and refactors wall damage code.
The Icarus is now fireable in gun form.  The point defense mode fires several lasers one after the other so that it can penetrate.  The main gun mode fires a modified meteor.  Also added an "abstract weapon" which has the projectile type settable for admin shenanigans.
Walls now lack an armor variable, which is replaced with buffed health.  Normal walls take 4 shots with a normal laser or 5 emitter bursts to destroy.  Reinforced walls now take 20 normal laser shots or 28 emitter shots.
Added some proactive runtime protection to logging for projectile impacts.  Without a valid firer, the jump button is linked to the victim.
2015-02-08 04:01:35 -07:00
Chinsky
6e3391f723 Merge pull request #8079 from mwerezak/doors
Fixes doors being usable remotely when broken
2015-02-08 13:11:52 +03:00
Chinsky
de3e81657d Added moar sanity. 2015-02-08 12:45:50 +03:00