Commit Graph

10033 Commits

Author SHA1 Message Date
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
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
Zuhayr
0955b001dc Merge pull request #8114 from mwerezak/hydrofix
Fixes randomized seed nutrient_consumption
2015-02-12 18:48:11 +10:30
mwerezak
5b5e16916f Replaces text expressions with macros 2015-02-12 01:55:12 -05:00
PsiOmegaDelta
d8b9b024be Merge pull request #8115 from mwerezak/powerfix
Fixes machines being usable after a power failure
2015-02-12 06:41:29 +01:00
Atlantiscze
4c4411259a PACMAN Generator NanoUI
- Gives PACMAN type generators NanoUI, instead of the old UI
- Example screenshot: http://i.imgur.com/QhQEw1c.png (Red usually means it's bad. In this case, generator is operating at 10 power level, but maximal safe level is 4 (it's varedited to these values, normally it would be only 5/5). Overheats also give warnings (warning shown on screenshot is last warning which occurs approximately 20 seconds before explosion). Fuel is measured in cm3. For simplicity, 1 sheet = 1000cm3
2015-02-12 06:09:42 +01:00
mwerezak
b7e3a14e0d Fixes machines being usable after a power failure
Fixes machines not gaining the NOPOWER flag after a power failure
because they were turned off and had use_power set to 0.
Fixes machines not gaining the NOPOWER flag after being moved into an
area with no power.

Both bugs allowed power using machines to be used in areas with no
power.
2015-02-11 23:28:53 -05:00
mwerezak
28f3bf739d Fixes randomized seed nutrient_consumption
Centers the range of possible values evenly between small amount and
heavy supply.
2015-02-11 23:06:29 -05:00
Atlantiscze
01b8873b9d Fixes PACMANs not working 2015-02-12 01:05:16 +01:00
PsiOmega
12e17e666f Minor casing fix.
I couldn't unsee the lowercase t in sentences beginning with "\the" instead of "\The". I'm sorry..
2015-02-11 19:53:08 +01:00
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets.
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01: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
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
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
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
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
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
GinjaNinja32
538ee11cb1 pAI rework 2015-02-09 01:58:54 +00: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
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
de3e81657d Added moar sanity. 2015-02-08 12:45:50 +03:00
Chinsky
30de86c081 Accessories update.
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
Kelenius
71dabeb557 Fixes ore scanner
Before: it didn't scan dark tiles and the tile you were standing on.
Now: scans both.
2015-02-08 05:52:12 +03:00
RKF45
13f09d95c8 Juice paints 2015-02-08 01:17:10 +01:00
RKF45
db6ff13f5f No painting ghosts!
Holograms can be coloured, though
2015-02-07 23:59:34 +01:00
Ccomp5950
8f2720b179 Merge pull request #8052 from mwerezak/boolit
New bullet types, projectile refactor
2015-02-07 14:07:22 -05:00
mwerezak
fac32d07e9 Merge remote-tracking branch 'upstream/dev' into boolit
Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/beams.dm
2015-02-07 00:57:04 -05:00
Chinsky
03125b97f4 Merge pull request #8056 from PsiOmegaDelta/ATMMachine
Corrects some RAS syndrome issues
2015-02-07 08:39:59 +03:00
Chinsky
fdd27dec21 Merge pull request #8078 from Ccomp5950/mentors
Added buttons back to Mentors
2015-02-07 08:24:30 +03:00
Ccomp5950
33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans
Update for the slimes
2015-02-07 00:20:13 -05:00
Ccomp5950
3ba295dadb Merge pull request #8073 from Loganbacca/projectilescleanup
Code cleanup
2015-02-07 00:17:24 -05:00
ccomp5950
a07e0a044f Added buttons back to Mentors
Before:  Mentors see ahelps they only see ckeys, no links no character names, etc.

Now:  Character names shows up and I've added a mentor specific link bar so mentors can use the buttons they already have easily.
2015-02-07 00:04:50 -05:00
mwerezak
414ad6b6da Merge remote-tracking branch 'upstream/dev' into pacman
Conflicts:
	code/modules/power/port_gen.dm
2015-02-06 23:32:39 -05:00