Commit Graph

16944 Commits

Author SHA1 Message Date
TheDZD
893e5a91c9 Merge pull request #1449 from Fox-McCloud/side-effects
Removes Unused/Non-functional Medical Side-Effects
2015-07-05 17:51:09 -04:00
TheDZD
59b154e8cb Merge pull request #1452 from Fox-McCloud/parents-and-procs
Tweaks a Few Destroy()'s
2015-07-05 17:51:03 -04:00
Fox-McCloud
32b991c6b8 Merge pull request #1447 from PJB3005/CARPET
Fixes fucked up lights on carpets and the alike.
2015-07-05 17:19:25 -04:00
Fox-McCloud
44881a4016 Tweaks a Few Destroy()'s 2015-07-05 04:51:47 -04:00
TheDZD
d8c3ff71dc Merge pull request #1442 from Fox-McCloud/dreaming
Dreams Refactor
2015-07-04 21:50:16 -04:00
TheDZD
547373b55f Merge pull request #1450 from Fox-McCloud/emitter-pooling-fix
Fixes Emitter Beam Pooling
2015-07-04 21:50:03 -04:00
Fox-McCloud
6610d71dd7 Fixes Emitter Beam Pooling 2015-07-04 20:59:12 -04:00
Fox-McCloud
650580c0b6 Removes Unused/Non-functional Medical Side-Effects 2015-07-04 18:10:44 -04:00
PJB3005
c860c76e4a Should fix #1401 2015-07-04 17:33:31 +02:00
TheDZD
8d32489565 Merge pull request #1438 from Fox-McCloud/black-powder-balance
Black Powder Balance
2015-07-04 10:08:18 -04:00
TheDZD
b904fc4fb5 Merge pull request #1434 from Fox-McCloud/analyzer-refactor
Analyzer Scan Refactor
2015-07-04 10:07:57 -04:00
Fox-McCloud
c5c66a0f06 Merge pull request #1439 from SamCroswell/martialarts
Swaps Weaken Values, Fixes Span Bug
2015-07-04 01:46:48 -04:00
Fox-McCloud
9fd889dbca Dreams Refactor 2015-07-03 17:42:26 -04:00
SamCroswell
45b89de37e Swaps Weaken Values, Fixes Span Bug 2015-07-03 01:03:59 -04:00
Fox-McCloud
3cea706688 Black Powder Balance 2015-07-02 17:46:24 -04:00
Fox-McCloud
6fd8d83f4b Merge pull request #1431 from tigercat2000/bayholder
Update mob holder code to bay's modular system.
2015-07-02 14:42:14 -04:00
Fox-McCloud
9e94e40db6 PDA 2015-07-02 02:26:47 -04:00
Fox-McCloud
389eab6e32 Analyzer Scan Refactor 2015-07-02 02:01:13 -04:00
ZomgPonies
7df2c7e71d Merge pull request #1427 from Fox-McCloud/supermatter
TG Supermatter Port
2015-07-01 23:49:19 -04:00
Fox-McCloud
4820fc7065 Merge pull request #1433 from FalseIncarnate/master
Grinder Fix, Botany qdel Refactor, Removes PanDEMIC 2200
2015-07-01 22:25:52 -04:00
FalseIncarnate
27f4ccda36 Grinder Fix, Botany qdel Refactor, Removes PanDEMIC2200
Fixes the reagent grinder machines not properly grinding tomato into
ketchup and rice into rice

Updates botany code to use qdel over del to help alleviate potential lag
from del calls

Removes the PanDEMIC 2200 board from Tech Storage and the Circuit
Imprinter, as the computer it builds has been commented out for a long
time. Also deletes the commented out code (over 250 lines of commented
out code deleted)
2015-07-01 22:09:37 -04:00
TheDZD
c05d218783 Merge pull request #1424 from Fox-McCloud/phoron-is-for-morons
Phoron is for morons
2015-07-01 17:54:33 -04:00
TheDZD
b8601761da Merge pull request #1418 from Fox-McCloud/light-power-fix
Lights Use Power
2015-07-01 17:52:47 -04:00
Chinsky
9a6f636815 Moved scooping into a seperate helper. 2015-07-01 09:31:54 -07:00
Fox-McCloud
28eda8802a RIP Plamsa, we barely knew you...*salutes* 2015-07-01 02:40:35 -04:00
Fox-McCloud
1120127233 Merge pull request #1425 from Robertha89/master
Revenant Role Candidacy
2015-06-30 22:34:46 -04:00
Fox-McCloud
110cfff989 Merge pull request #1426 from Krausus/AwayMissionLightingFix
Fixes Away Mission Lighting
2015-06-30 22:20:31 -04:00
Robertha89
fdb302e5a6 7 days 2015-07-01 03:40:47 +02:00
Robertha89
b069ed6b01 Revert "7 days"
This reverts commit 42c5c29b12.
2015-07-01 03:38:41 +02:00
Robertha89
42c5c29b12 7 days
title
2015-07-01 03:37:11 +02:00
Fox-McCloud
a569c898e9 tweak 2015-06-30 21:24:26 -04:00
Krausus
8ff6329c65 Fixes Away Mission Lighting 2015-06-30 21:09:16 -04:00
Fox-McCloud
62ef1cb7e2 TG Supermatter Port 2015-06-30 21:07:08 -04:00
Fox-McCloud
c2567b92a8 Merge pull request #1414 from SamCroswell/martialarts
Thunderdome and Admin Room Changes
2015-06-30 16:55:10 -04:00
Robertha89
db7d636c29 Fixes derp
There is to Revenant gamemode.
2015-06-30 21:35:10 +02:00
Robertha89
c9a8695f0c Revenant Role Candidacy
Fixes https://github.com/ParadiseSS13/Paradise/issues/1395 maybe
2015-06-30 21:31:02 +02:00
FalseIncarnate
39305b1a86 Food/Pill Fixes
Fixes Food and Pills so that they actually transfer their reagents
properly
- Big thanks to Krausus for helping with locating and correcting the
issue

Fixes IPCs being able to eat pills.
- They have a monitor for a head, where do you think you're going to put
that?

Fixes IPCs being immune to the soothing effects of water
- IPCs that are on fire can be properly doused with a splashing of
water.
2015-06-30 09:27:06 -04:00
Fox-McCloud
0ec14cf267 Merge pull request #1412 from Krausus/PrescriptionGlassesRefactor
Refactors and Expands Prescription Glasses Upgrades
2015-06-30 02:25:00 -04:00
Fox-McCloud
cc553ab691 Merge pull request #1416 from TheDZD/fluff
Gibson1027 Fluff items
2015-06-30 01:22:40 -04:00
Fox-McCloud
4d04bb7750 Guts Moronic Phoron 2015-06-30 01:06:09 -04:00
Fox-McCloud
246aff600e Lights Use Power 2015-06-29 21:15:22 -04:00
Fox-McCloud
bae23b11f1 SMES Fix 2015-06-29 20:32:00 -04:00
DZD
3c29805776 Gibson1027 Fluff items
- Bear pelt hat subtype that is instead a polar bear pelt that has its
edges covered in blood. This is missing a proper non-mob icon, currently
uses the default bear pelt hat, but shows up as the polar bear pelt on
mobs when worn.
2015-06-29 19:36:35 -04:00
ZomgPonies
62d8435b12 Merge pull request #1410 from Fox-McCloud/ether
[Chemistry] Adds in Ether
2015-06-29 19:05:51 -04:00
ZomgPonies
f969a0f659 Merge pull request #1394 from Fox-McCloud/ai-vox
AI Vox Refactor
2015-06-29 19:04:05 -04:00
TheDZD
c2fe7ea9e7 Merge pull request #1406 from tigercat2000/newhal
New hallucinations
2015-06-29 18:36:15 -04:00
TheDZD
524fa94205 Merge pull request #1407 from Fox-McCloud/Chainsaw-tweak
Chainsaw Tweaks
2015-06-29 18:35:23 -04:00
SamCroswell
4301223201 Fixes Icon Override 2015-06-29 17:50:01 -04:00
Tigercat2000
588f3eebcf Sanity-checking for xeno attack hallucination 2015-06-29 14:11:06 -07:00
Fox-McCloud
490dcc2b20 re-add liberty cap morphine---FARRRRR OUTTTT 2015-06-29 16:40:26 -04:00