TheDZD
0fdfae99ba
Merge pull request #1966 from Fox-McCloud/health-assembly
...
Health Assembly
2015-09-07 17:24:52 -04:00
TheDZD
ec3113f44b
Merge pull request #1964 from Fox-McCloud/rnd-update
...
R&D Update: Implants and Autolathes
2015-09-07 17:20:44 -04:00
Fox-McCloud
a8f41c69fb
sprite-revert
2015-09-07 16:55:40 -04:00
Mark van Alphen
6c1208e18f
Merge pull request #1819 from Aurorablade/GoOnYourFeet
...
[Sprite] [TG Port] Things that go on your feet
2015-09-07 22:31:21 +02:00
Fox-McCloud
fc82cc6976
typo
2015-09-07 13:52:37 -04:00
Fox-McCloud
e97e6d1cc9
Merge pull request #1973 from Markolie/intercom
...
Fix invincible spiderbots and cryo bags
2015-09-06 23:35:49 -04:00
Markolie
8abdc80987
Fix invincible spiderbots and cryo bags
2015-09-07 04:49:55 +02: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
Fox-McCloud
3250621552
Health Assembly
2015-09-06 02:19:44 -04:00
Fox-McCloud
2214a8b455
R&D Update: Implants and Autolathes
2015-09-05 23:57:22 -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
