Commit Graph

16886 Commits

Author SHA1 Message Date
Fox-McCloud
490dcc2b20 re-add liberty cap morphine---FARRRRR OUTTTT 2015-06-29 16:40:26 -04:00
Fox-McCloud
a89ddd5a7d Adds in Ether 2015-06-28 20:39:26 -04:00
Fox-McCloud
2a34b600a9 Merge pull request #1397 from Krausus/GarbageCollectorWasGarbage
Garbage Collector Fixes/Tweaks/Cleanup/Documenting
2015-06-28 06:36:04 -04:00
Fox-McCloud
250876f536 Merge pull request #1396 from Spacemanspark/master
Syndicate Hardsuit elaborations
2015-06-28 06:35:40 -04:00
Fox-McCloud
d4779a873a Merge pull request #1390 from FalseIncarnate/master
Prescription Glasses Upgrades and Sec Beret Sprite Fix
2015-06-27 17:45:09 -04:00
Spacemanspark
b83c795486 Syndicate Hardsuit mode elaborations
Elaborates on what both the Travel mode and Combat mode does.
2015-06-27 01:47:08 -05:00
Krausus
b386cec388 Initial GC fixes/tweaks/cleanup/documenting 2015-06-27 01:56:57 -04:00
FalseIncarnate
83ec4b7a4e del() Wars Episode 6: Return of the qdel()
Changes del() calls to qdel() calls
2015-06-26 16:36:16 -04:00
PJB3005
5540a50ed7 Fixes an unreported issue that caused lights to get stuck 2015-06-26 10:56:33 +02:00
FalseIncarnate
be5f8b6ad3 Prescription Upgrades and Sec Beret Sprite Fix
Adds the ability to combine prescription glasses with a couple other
glasses
- Mesons + Prescription Glasses = Prescription Mesons
- You cannot upgrade the Night Vision Mesons with prescription glasses
- Sunglasses + Prescription Glasses  = Prescription Sunglasses
- HUDSunglasses + Prescription Glasses = (NEW!) Prescription
HUDSunglasses.

Adds the ability to use a screwdriver to disassemble (separate) the
above upgraded glasses.
- Returns the prescription glasses and the
mesons/sunglasses/HUDSunglasses

Also fixes the sprite for the north-facing Security Officer Beret
randomly having some orange pixels.
2015-06-25 19:54:38 -04:00
ZomgPonies
06a07ec2e5 Merge pull request #1386 from tigercat2000/tramStops
MTTS: Delay Rails, for stations.
2015-06-25 19:00:39 -04:00
ZomgPonies
dd5112cfc7 Merge pull request #1382 from TheDZD/master
Anxipal Fluff Item
2015-06-25 19:00:18 -04:00
ZomgPonies
97b0b4e830 Merge pull request #1380 from tigercat2000/freeze
Admin-freeze refactor and fixes.
2015-06-25 18:59:25 -04:00
Fox-McCloud
76837a0bce Merge pull request #1388 from PJB3005/master
In which I realise that I am an idiot.
2015-06-25 18:11:21 -04:00
PJB3005
a1c4c2eec6 goddamnit spess 2015-06-25 15:24:16 +02:00
Fox-McCloud
b740f8930e Merge pull request #1377 from Robertha89/master
Definitely Not Ian
2015-06-25 02:31:14 -04:00
TheDZD
7ed0902b4f Merge pull request #1374 from Robertha89/patch-1
Supply crates medical
2015-06-24 21:26:57 -04:00
Tigercat2000
30747b1dfd MTTS: Delay Rails, for stations. 2015-06-24 18:05:36 -07:00
Fox-McCloud
c28f9bb8ca Merge pull request #1370 from FalseIncarnate/master
Synthetic Reagent Processing and Synth Drugs
2015-06-24 17:49:02 -04:00
TheDZD
9943a26c91 Merge pull request #1326 from Fox-McCloud/revenants
Revenant
2015-06-24 17:48:18 -04:00
Fox-McCloud
dad2964757 link update 2015-06-24 16:48:26 -04:00
DZD
9d4ffb7884 Anxipal Fluff Item 2015-06-24 14:02:42 -04:00
Tigercat2000
3f2506e8fc Admin-freeze refactor and fixes.
Admin freezing is now based on mob procs, instead of a lengthy else-if
change.

Other changes:
 - No longer depends on paralysis, instead uses sleeping.
  - No more frozen mobs setting off bombs.
 - Simple animals and slimes override the default proc to make freezing
   affect them as one would expect.
 - Frozen var has been moved from human defines to living defines, no use
   yet.
 - Mobs frozen are added to a global 'admin_frozen_mobs' list.
  - List is used to determine if the freeze verb should freeze or unfreze.
 - Moved mob freeze-related vars to freeze file.
2015-06-24 10:38:19 -07:00
Robertha89
dbb15180a1 Removes lazarus from crittercare 2015-06-24 19:23:17 +02:00
ZomgPonies
c7508a0980 Merge pull request #1376 from Robertha89/patch-2
Pet Collar Bug Fix
2015-06-24 13:01:21 -04:00
ZomgPonies
a0147487c8 Merge pull request #1369 from Fox-McCloud/fox-fluff
Custom Item: Fox P McCloud
2015-06-24 13:00:58 -04:00
Fox-McCloud
02aaca9c7b Merge remote-tracking branch 'upstream/master' into revenants 2015-06-23 23:44:20 -04:00
Robertha89
4ef6295414 I made changes
where they where not needed due to an oooooold bug.
2015-06-24 04:41:12 +02:00
Robertha89
6968560e16 herp
de derp
2015-06-24 04:40:03 +02:00
Robertha89
b7e43286a6 New hat for Ian and new tool for pets
while life serve the same function, it is somewhat difficult to make,
the lazarus injector revives any neutral simple_animal on use, and can
turn hostile animals friendly towards them if it has been emped. so five
of those has been added to the crittercare.

Most importantly, Ian got  a new mask, the mustache.
2015-06-24 04:37:48 +02:00
Fox-McCloud
b8d21f6721 Merge pull request #1368 from TheDZD/hardsuit-attachment
Hardsuit Attachment Changes
2015-06-23 21:22:55 -04:00
Robertha89
fc6ec4982f Pet Collar Bug Fix
If you had Ian with a pet collar name like spot, and you gave him say a wizard name, then he would deafault to his real_name over his name, and making it impossible to restore the name on the collar.
2015-06-24 03:20:32 +02:00
Robertha89
9573213bab revert viro access 2015-06-24 01:27:28 +02:00
Robertha89
733368a101 Supply crates medical
Adds brute trauma treatment kits to cargo.
Changes access on Virus crate from CMO to Virologist, as the reason it was there in the first place was due to the previous system having virus bottle for direct use, and without being able to feed this virus it can't infect people, maybe.
2015-06-24 00:48:37 +02:00
FalseIncarnate
f3c9098ecd Reaction_Mob Checks and Golem Reagent Processing Change
Reaction_mob(), which handles things like TOUCH based reactions, now
will properly obey process_flags.
- This means things like Synthflesh won't work on Synthetics.

Changed Golems from PROCESS_DUO to PROCESS_ORG
- This will give them back the ability to be healed via chemistry, since
they don't naturally regenerate.
- PROCESS_DUO remains defined in case someone finds a use for it
(adminbuse maybe?)
2015-06-23 18:06:54 -04:00
Tigercat2000
e41fbaa146 Fix ziptie log being backwards. 2015-06-23 13:19:05 -07:00
FalseIncarnate
fc6ebc4854 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-06-23 04:18:46 -04:00
FalseIncarnate
acf1e268f1 Synthetic Reagent Processing and Synth Drugs 2015-06-23 04:17:01 -04:00
Fox-McCloud
b2837f6023 tweaks, update 2015-06-22 22:41:58 -04:00
ZomgPonies
4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -04:00
Tigercat2000
bcb4a9601f Merge remote-tracking branch 'upstream/master' into poolit
Conflicts:
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/lamarr_cage.dm
2015-06-22 13:40:07 -07:00
Fox-McCloud
44f7ad997c Merge pull request #1355 from tigercat2000/tgetor2
Bay/-tg- Meteor port
2015-06-22 16:37:23 -04:00
DZD
c8c90608e1 Hardsuit Attachment Changes
- Makes it so you don't have to be on help intent, or targeting the head
to attach a helmet onto a hardsuit.
- Same deal for attaching magboots to a hardsuit.
2015-06-22 10:43:37 -04:00
Krausus
62946e5217 Fixes medical wardrobe containing excess clothing 2015-06-21 22:07:40 -04:00
Tigercat2000
d129ceb53f Make flaming meteors more flamey. 2015-06-21 18:54:42 -07:00
Krausus
831332155a Fixes generic wardrobe contents
This fixes the wardrobe base type creating items, which was fine when
wardrobes didn't call their parent's New proc, but was causing literally
every wardrobe to contain some junk now that they do.

The base wardrobe type's items have been moved to a new "generic"
wardrobe, which is now used in the derelicts and an unused away mission,
replacing mapped instances of the base type.
2015-06-21 21:50:35 -04:00
Tigercat2000
f916eb7e2d Fix a few ex_act's. 2015-06-21 18:40:00 -07:00
Tigercat2000
7c9139d6e0 Bay/-tg- Meteor port
Meteors now have different types, properly integrated.
Meteoract has been removed, meteors now just call ex_act.
2015-06-21 18:39:39 -07:00
Tigercat2000
0918ded8be Remove debugging "world <<" from qdel. 2015-06-21 17:06:33 -07:00
Fox-McCloud
8cffde0d46 Merge pull request #1365 from PJB3005/master
oh god I hope this fixes spess
2015-06-21 19:56:04 -04:00