Commit Graph

9304 Commits

Author SHA1 Message Date
Bone White
6cd660874c Civilian round-start fix (2)
Hopefully it works this time, tested locally as extensively as I can.

I have left a _very_ verbose debug line (103) in job_controller.dm which
should be commented out very soon.

Please keep var/Debug2 in global.dm set to 1 for the forseeable future,
to help diagnose job problems.
2014-10-28 02:51:27 +00:00
Fox-McCloud
eb21c8e4b0 Revert "Civilian round-start fix" 2014-10-27 21:36:18 -04:00
Fox-McCloud
ab88e06519 Merge pull request #445 from Bone-White/master
Civilian round-start fix
2014-10-27 11:57:22 -04:00
Bone White
6853a69b1f Bulletproofing
Better bulletproofing of the civilian round-start fix
2014-10-27 15:53:35 +00:00
Bone White
9b9c20b115 Civilian round-start fix 2014-10-27 15:47:05 +00:00
Fox-McCloud
e0059bbf46 Implant Fix 2014-10-25 22:47:09 -04:00
Fox-McCloud
3328b9f30c Merge pull request #440 from Fox-McCloud/R&D-Nerfs
R&d nerfs
2014-10-25 21:18:13 -04:00
Fox-McCloud
678027dfe1 Merge pull request #441 from Bone-White/master
Added Radiation Laser
2014-10-25 21:12:00 -04:00
Bone White
42867b255d Added Radiation Laser
Traitor item, cmo/doctor/virologist only.  3 TC cost, looks like a
health analyzer but is a delayed radiation + stun effect on attack.  Has
recharge time and configurable settings.

Fox did most of the work, I just fixed it.
2014-10-26 01:08:18 +00:00
Fox-McCloud
097cc95bd2 R&D Nerfs 2014-10-25 20:54:25 -04:00
Fox-McCloud
0028617926 Merge pull request #439 from melandor0/paradise
Sec/Med Hud fixes
2014-10-24 21:55:31 -04:00
melandor0
4a081070b3 Sec HUD fixes
Now reports beepsky and ED 209 arrest activity.
2014-10-24 21:16:00 +02:00
Bram961
1e8681cc11 Pirate outfit
A new outfit looking like the one a pirate captain would wear
2014-10-24 17:16:42 +02:00
Fox-McCloud
b6c46fdc63 Merge pull request #435 from melandor0/paradise
Drugs, Vampires, Plasma windows
2014-10-21 23:22:20 -04:00
melandor0
546b6caf59 Preliminary new drugs 2014-10-20 02:52:54 +02:00
Bone White
4419dc7243 Handcuff grab-requirement reversion
As requested by Fox
2014-10-18 18:05:10 +01:00
Bone White
ebe1026bda Improved Sleeper error message clarity 2014-10-18 12:16:27 +01:00
Bone White
1439dd5579 Hardsuit equip time reversion
At Fox's request
2014-10-18 01:46:28 +01:00
DZD
4ba9431ac6 Merge Pull Requests #430 and #431 from ZomgPonies/master 2014-10-15 18:38:33 -04:00
Fox-McCloud
8c1f6431e6 Tweaks and Fixes and Major Map Changed
More Info will be posted directly, later.
2014-10-13 22:00:07 -04:00
DZD
53de43ba9e Tables Climbing Through Solid Objects Fix
-Tables don't consider themselves solid object when trying to climb over
them.
2014-10-10 15:01:53 -04:00
Fox-McCloud
e09dce8d44 Merge pull request #425 from Fox-McCloud/Balance-Fix-Tweak-Round1
Balance fix tweak round1
2014-10-09 04:19:21 -04:00
DZD
2668bb6f9b Shutter and Table Tweaks
-Can no longer climb onto tables that are inside solid objects.
-Added shutters to HoP Office
-Fixed Psych Office shutters button so that it is linked to the Psych
Office shutters and not the ones in surgery.
2014-10-05 22:19:09 -04:00
FalseIncarnate
dae3c5e24a Fixed Buckets, Pest Spray, etc for Hydroponics
Allows hydroponics trays to be filled from buckets, bottles, beakers,
etc. as well as fixing Pest-spray (plus the unused Weed-spray) and
Plant-B-Gone being unusable on trays.

TL;DR: Botany is now less tedious and makes more sense.
2014-10-01 15:26:09 -04:00
Fox-McCloud
9c8326e120 Fix, Tweak, and Revise
fixes a few non-functioning things, adds in a few new features,
basically the previous patch minus "controversial" stuff.
2014-09-29 02:10:28 -04:00
PJB3005
58a76e7534 RCSses can send crates
simple copy paste of the code for closets
2014-09-24 17:23:26 +02:00
Necaladun
93f071651c Merge pull request #418 from Bone-White/master
Fix for npc xeno screaming whilst dead
2014-09-15 07:34:04 +09:30
Bone White
d81a87363e Fix for Ryetalin
Cures on a chance based on volume of ryetalin injected, on_mob_life.
TURNS OFF ALL MUTATIONS!!

// 1 volume = ~2% chance
// 10 volume = ~17% chance
// 30 volume = ~38% chance

Returns SE to mob creation values (now set in dna2.dm)
2014-09-14 11:39:52 +01:00
Bone White
6dcdb63053 Possible cloned cultist view fix
Needs live testing, should fix the problem of the mask only being able
to track a cultist's first body, and not being able to follow them if
they've been cloned.
2014-09-13 11:50:36 +01:00
Bone White
6f40f1ed3d Gravity mega stun fix 2014-09-13 08:48:17 +01:00
Bone White
205a30da7b Cult talismen from paper fix
Talismen made from starting cultist stack now equip to backpack, pockets
or hands.  Will not use up a paper of the stack if the talisman cannot
be equipped.
2014-09-08 22:52:27 +01:00
Bone White
a94d818e66 Cult communication talisman fix 2014-09-08 22:51:27 +01:00
melandor0
7ff72c38cd nanotrasen.se
Replaces 80.244.78.90 with nanotrasen.se in the code.
2014-09-04 19:45:43 +02:00
melandor0
59f73acfd3 Traitorstation Fixes + SyndieCat
Fixes some things with traitorstation and adds SyndieCat.
2014-09-02 13:53:11 +02:00
ZomgPonies
d6375b75cd Merge pull request #408 from Xaltonon/send-to-upstream
CMO and paramedic access tweaks
2014-08-30 07:29:17 -04:00
Bone-White
8d0536d656 Merge pull request #3 from ZomgPonies/master
Downstream update
2014-08-28 15:08:46 +01:00
Bone White
c23a8d3513 Adds traitor station z level
also access via telescience with emag and z level set to 7
2014-08-28 14:58:17 +01:00
Xaltonon
c9f3eea32c CMO and paramedic access tweaks 2014-08-27 22:49:22 -07:00
ZomgPonies
770818f336 Merge pull request #402 from VampyrBytes/master
Cleanup of internal organs
2014-08-21 16:11:52 -04:00
Bone White
80d3bff885 Fixes a minor bug with pipe laying 2014-08-21 11:23:55 +01:00
VampyrBytes
c0f5132664 Cleanup of internal organs
Both internal and external organs are a mess, which is making
maintaining and updating them nasty, so I'm cleaning them up, this is
the first stage

mechanical and assisted internal organs are now an object type rather
than a var in the organ which makes it much cleaner and easier to adjust

removed duplicate list of internal organs as there's no reason to have
the same objects in 2 separate lists

made New() a lot cleaner and more robust

External organs will be next
2014-08-21 10:24:13 +01:00
ZomgPonies
6ebb6d617e Merge pull request #399 from Bone-White/master
Rigid suit equip delay rework
2014-08-20 03:07:09 -04:00
ZomgPonies
f4b6450a20 Merge pull request #398 from VampyrBytes/master
IPC and nuke disk fixes
2014-08-20 03:07:01 -04:00
Bone White
b5fcd209b2 Rigid suit equip delay rework
now uses a couple of new procs, allowing for per-suit tweaking of time.
You now cannot equip eva helms without first attaching them to the suit
(target head use helmet on suit)
2014-08-20 07:28:44 +01:00
VampyrBytes
5b8253fb57 IPC and nuke disk fixes
Fix for IPC revival
Prevents nuke disk from being inserted via cavity surgery
2014-08-19 07:06:12 +01:00
ZomgPonies
b314db6296 Merge pull request #394 from VampyrBytes/master
Genetics fixes
2014-08-18 19:19:58 -04:00
ZomgPonies
7139b92b47 Merge pull request #393 from Bone-White/master
Diona speed fix
2014-08-18 19:19:05 -04:00
Bone White
d2129341b9 Adds equip/unequip times to rigid suits
Also stops helmets being worn without the rigid suit already on the mob.
2014-08-18 08:16:06 +01:00
mwerezak
f62aeee76e Fixes #6002 2014-08-16 21:46:45 -04:00
ZomgPonies
ed484b68aa Compile fix 2014-08-16 21:45:36 -04:00