Commit Graph

10603 Commits

Author SHA1 Message Date
Tigercat2000
156bdb64c2 Split giant chemistry files into oldchem folder
This commit does the following:
 - Removes relative pathing from:
  - Chemistry-Holder.dm
  - grenade_launcher.dm
  - reagent_dispenser.dm
 - Splits Chemistry-Reagents.dm into oldchem/reagents/
 - Splits Chemistry-Recipies.dm into oldchem/chemical_reaction/

Another couple of huge relative-pathed files resolved.
2015-09-06 20:41:37 -07:00
Fox-McCloud
e20fedaec1 Merge pull request #1957 from tigercat2000/tg_xeno_tweaks
Misc. -tg- xeno tweaks
2015-09-06 16:48:15 -04:00
TheDZD
fe2a3ef960 Merge pull request #1954 from Fox-McCloud/material-datums
Material datums, Recycler Refactor, and Additional Item Materials
2015-09-05 19:36:15 -04:00
Tigercat2000
54d2fa8c84 Misc. -tg- xeno tweaks
This commit does the following:
 - Allows xenomorphs to mine through mineral turfs (the asteroid)
 - Changes weed spreading to use atmos procs; It will spread like gas, not
   just checking "oh, dense object, no pass for me!"
  - No, this doesn't mean it will spread infinitely or quicker, just
    changes where it can spread.
2015-09-05 08:34:08 -07:00
Regen
7ae1db48b6 Merge remote-tracking branch 'paradise/master' into uselesadminverb 2015-09-05 15:57:50 +02:00
Fox-McCloud
6f53ca4b4e Merge pull request #1953 from KasparoVy/master
Adds Vox Security Uniforms + Warden/HoS Corporate Uni. to Their Lockers
2015-09-05 05:55:50 -04:00
Fox-McCloud
fa0489889e Merge pull request #1938 from Aurorablade/BloodIsBad
[Sprite][Balance][Slaughter demon]Bleeding is now illigal
2015-09-04 22:59:05 -04:00
Fox-McCloud
64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Fox-McCloud
e8f486f397 Merge pull request #1946 from Markolie/intercom
Remove radio free range
2015-09-04 22:47:24 -04:00
TheDZD
07acac3bfd Merge pull request #1944 from Fox-McCloud/cult-tweaks
Cult Tweaks
2015-09-04 22:01:11 -04:00
TheDZD
3515997a90 Merge pull request #1942 from Fox-McCloud/holy-water
Holy Water Rework
2015-09-04 21:58:59 -04:00
Fox-McCloud
ea6bfdf758 upgradeable recycler 2015-09-04 19:41:42 -04:00
Markolie
d1cb874451 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 2015-09-05 01:39:40 +02:00
Fox-McCloud
46ce41fbc8 unused var axing 2015-09-04 18:04:34 -04:00
Fox-McCloud
fd8b4ca578 numbers fixes 2015-09-04 17:32:22 -04:00
Fox-McCloud
5bb851b771 Pass II 2015-09-04 16:32:18 -04:00
Markolie
26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
KasparoVy
10a1e75d79 Adds Vox Security Uniforms
Adds a Vox version of every security uniform with the exception of the
jackets.

Picture coming soon!
2015-09-04 03:10:27 -04:00
Mark van Alphen
e50fc4639c Merge pull request #1952 from Fox-McCloud/brain-fix
Brain Damage Fix
2015-09-04 08:12:02 +02:00
Fox-McCloud
7c29e59784 Materialized Datums 2015-09-04 01:40:06 -04:00
Fox-McCloud
6d0ee54db2 Merge pull request #1436 from Aurorablade/ImportentpAIUpdate
Best pAI Update EVER
2015-09-03 22:41:07 -04:00
Fox-McCloud
ffb6708cca metabolization 2015-09-03 22:15:45 -04:00
Fox-McCloud
f48c624d99 indent-fix 2015-09-03 22:04:04 -04:00
Fox-McCloud
37cb7ee8d5 Brain Damage Fix 2015-09-03 21:59:21 -04:00
Fox-McCloud
e88a4131bf Merge pull request #1936 from KasparoVy/master
Vox Coloured Uniforms
2015-09-03 21:33:55 -04:00
TheDZD
f8f878765f Merge pull request #1949 from tigercat2000/whopseat
Fix mobs being unable to eat other mobs
2015-09-03 18:23:44 -04:00
Tigercat2000
3b5534f26d Fix mobs being unable to eat other mobs 2015-09-03 14:50:05 -07:00
KasparoVy
236dee303b Unnecessary spaces 2015-09-03 17:31:27 -04:00
KasparoVy
0e10bd2cc3 Fixes Psychedelic Jumpsuit
It wasn't using the Vox sprite because I'd forgotten to give this one a specific species_fit and sprite_sheets as it isn't a child of obj/item/clothing/under/color/
2015-09-03 17:29:41 -04:00
Regen
da1b734c4b Removes unused adminverb
VV editing the AI name works just fine
2015-09-03 23:19:08 +02:00
TheDZD
19c4f9d4ef Merge pull request #1929 from Fox-McCloud/edagger
Adds in E-Daggers
2015-09-03 16:56:01 -04:00
TheDZD
62add0a3e3 Merge pull request #1935 from Fox-McCloud/recycling
Disposals/Recycling Remap
2015-09-03 16:55:53 -04:00
Fox-McCloud
e63cbd1e42 unholy water processing 2015-09-03 16:40:49 -04:00
Markolie
829441bd01 Fixes https://github.com/ParadiseSS13/Paradise/issues/1930 2015-09-03 22:20:26 +02:00
Markolie
3a3457de36 Port Bay's intercom overhaul 2015-09-03 21:21:20 +02:00
KasparoVy
34d7b280dc Put Jerseys back
Because travis, and apparently it IS used for something despite my not
finding any sprites for it (even for HUMANS). I guess I'll have to look
harder
2015-09-03 14:57:32 -04:00
KasparoVy
038011441f Missed a spot 2015-09-03 14:46:22 -04:00
KasparoVy
2937382b15 Moves Species_fit and Sprite_sheets to /obj/item/clothing/under/color, Removes Jerseys
Greatly reduces code as per Fox' suggestion. I outright snipped out the red and blue jerseys at the bottom because in the human icons/mob/uniform.dmi there aren't even sprites for it, and I've never ever heard of it being used. The blackf suit appears to use the same sprite as the black suit, so I figured that'd be alright too.
2015-09-03 14:45:41 -04:00
Fox-McCloud
9b8342897e Cult Tweaks 2015-09-02 21:08:08 -04:00
Fox-McCloud
82103db931 Holy Water Rework 2015-09-02 17:24:51 -04:00
Aurorablade
5bb105b80f new icon, nerf 2015-09-02 10:30:23 -04:00
KasparoVy
255e0bd6a8 I'm dumb 2015-09-02 02:08:54 -04:00
KasparoVy
54376d4cff Vox Coloured Uniforms
Adds a Vox sprite for every single coloured uniform in color.dm and
implements it.

Had this PR waiting 'cause the stupid way I do things only allows me to
do one at a time, haha.

Anyway, you're going to have to use your imagination for this one-- as
it would be an insane amount of work to photoshoop every single sprite
onto a Vox and make a rainbow out of the lot of them.

I really wish my Dream Daemon wasn't broken.
2015-09-02 01:44:20 -04:00
Mark van Alphen
6918f3073e Merge pull request #1921 from KasparoVy/master
Chief Engineer Hardsuit Fix
2015-09-02 07:21:37 +02:00
Fox-McCloud
9f5ce7b1a1 Disposals/Recycling Remap 2015-09-02 01:01:08 -04:00
Mark van Alphen
27e5a51cae Merge pull request #1932 from Fox-McCloud/derp-fox
Fixes Derp Fox
2015-09-02 06:42:20 +02:00
Spacemanspark
76bf14f009 Fixes *halt spam.
I'm sorry.
2015-09-01 22:15:04 -05:00
Fox-McCloud
5c9a6257f3 Fixes Derp Fox 2015-09-01 22:46:33 -04:00
Fox-McCloud
06ee1a618a Merge pull request #1928 from Markolie/fax
Fix admin viewing paper bundles
2015-09-01 17:58:48 -04:00