Commit Graph

17074 Commits

Author SHA1 Message Date
Bone White
16a9025ef1 Virology Update
new/altered symptoms, including a lot of empty symptoms especially for
higher viruses.
2014-07-23 03:13:04 +01:00
ZomgPonies
f491b31d2b PR fixes 2014-07-22 20:05:26 -04:00
ZomgPonies
1812fe529d Merge pull request #315 from IcyV/overdose
Fixed version of a trial overdose system.
2014-07-22 19:45:06 -04:00
ZomgPonies
62c5b3e972 Merge pull request #313 from VampyrBytes/master
rewrite for DF/CM and grill
2014-07-22 19:42:23 -04:00
IcyV
6b4d2f7c82 Fixed version of a trial overdose system.
Applies basic toxin damage when a volume threshold is met.
2014-07-22 16:39:16 -07:00
ZomgPonies
a422f28445 Oops 2014-07-22 18:32:08 -04:00
ZomgPonies
14b7c17b6a Spider nerf 2014-07-22 15:11:03 -04:00
ZomgPonies
e9bb127f70 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-07-22 14:59:15 -04:00
Walter0o
b24aafa3d6 borer mindcontrol release hotfix
forgot to remove this remnant ckey check
2014-07-22 13:54:19 -04:00
ZomgPonies
b797cf5152 Merge pull request #311 from mwerezak/paradise-docking
Fixes specops shuttle messages
2014-07-22 08:24:42 -04:00
Necaladun
467c289cc2 Removed gun and armour from HoP closet
Removed egun, helmet and armour from HoP because they are NOT sec.
2014-07-22 18:48:49 +09:30
Necaladun
61e8fc8117 Minor map tweaks
Moved blueshield's laptop, added proper area tag for recruiter
2014-07-22 18:21:16 +09:30
Necaladun
ded5462196 Fluff items
Ion chef medal and purple zippo
2014-07-22 17:51:02 +09:30
mwerezak
931f592fae Fixes specops shuttle messages
Specops messages were reversed due to paradise using a different values
for specops shuttle location.
2014-07-21 20:27:26 -04:00
Mark Aherne
992ceecd4e NanoUI updates.
* Map gen verb is now limited to those with server access.
* Added Z layer support.

Conflicts:
	code/modules/admin/admin_verbs.dm
	nano/images/nanomap.png
2014-07-21 18:54:19 -04:00
VampyrBytes
4113b531af rewrite for DF/CM and grill
rewrite cos damn!

No more spam names... worst they can get is one of each type in a name.
CM won't accept anything that's been cerealized (at any point), DF and
grill will accept things that have been in them before, but you'll end
up with a burned mess, a cloud of smoke, and the chance of a small fire
2014-07-21 20:37:25 +01:00
ZomgPonies
4b98dc1ff4 Xeno nerf 2014-07-21 10:08:02 -04:00
ZomgPonies
8b703f55af Made wizard spells into various subtypes 2014-07-21 09:40:42 -04:00
ZomgPonies
d55450b8ee Merge pull request #310 from IcyV/testing
Reverts hyperzine to its previous state, keep its addictivness.
2014-07-21 07:09:57 -04:00
Walter0o
bf61a0b593 removes second sleeping notification 2014-07-21 06:21:13 -04:00
IcyV
6198d9e9d9 Reverts hyperzine to its previous state, keep its addictivness
Revert "Made hyperzine same color as salt, because HAHA"

This reverts commit b23b5b62d9.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

Revert "Made hyperzine harder to make properly."

This reverts commit 489cdf0096.

Removes Benazine

Revert "Nerfs for OD"

This reverts commit 4b94406efb.

Revert "Hyperzine fix"

This reverts commit d6702496f9.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

Revert "Made Cyanide more deadly, added OD to Hyperzine"

This reverts commit 1cb87e07cf.
2014-07-21 03:15:14 -07:00
Zuhayr
7c07240ac9 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites.
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/alien.dm
	code/modules/projectiles/guns/projectile/crossbow.dm
	code/modules/projectiles/guns/projectile/pneumatic.dm
	icons/mob/back.dmi
	maps/tgstation2.dmm
2014-07-21 06:10:45 -04:00
Rob Nelson
471bc24c1e Standardize computer luminosity shit, deduplicate power stuff. 2014-07-20 16:17:19 -04:00
d3athrow
35d327de5b atmos control map, doesn't have clickable alarm overlays just yet.
made oxyloss and toxloss easier to read on the nanoui.
2014-07-20 11:12:04 -04:00
dylanstrategie
d78d9eabc2 Added a few more machines
Conflicts:
	code/game/machinery/Sleeper.dm
	code/game/machinery/adv_med.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/cloning.dm
2014-07-20 11:11:40 -04:00
dylanstrategie
4e10136895 Added luminescence to some computers
- Added colored lights to all listed computers
- Should be fullly functional
- Uses the code Pomf used for Telecomms Computer testing

Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/station_alert.dm
	code/game/machinery/telecomms/traffic_control.dm
2014-07-20 11:07:59 -04:00
Rob Nelson
ee5d2c8a1c Trash autoignition
Conflicts:
	code/game/objects/items/trash.dm
2014-07-20 10:59:44 -04:00
Atlantiscze
c569dd05c8 Adds battery status icon to NTOS
- Laptops now have status icon which shows status of their internal battery.
- Adds support for "status bar" - allows more status icons in future (such as, network connection? time? whatever), status bar icons should be 16x16px
2014-07-20 10:39:08 -04:00
Atlantiscze
51ea8f8676 Fixes #5572
- Detective-vended laptops now have medical records program installed.
2014-07-20 10:38:17 -04:00
Atlantiscze
5e8e90c4a8 Fixes #5569, Fixes #5571
- Reworked card reader code, it's cleaner and less copypaste now
- Updated medical records, security records and HoP card computer to work with the update. It's however possible i missed something, can't go through all computers in game. Tell me if you find something that's broken due to this, i will fix it ASAP.
- Security records color for "none" security status changed a bit so it doesn't burn eyes of anyone trying to  read it (issue #5571 - white on light green? Bad choice imo)
- Multi-card readers now actually WORK for laptops. This includes security records (issue #5569) and medical records (same case, just not reported). You still have to insert your card into read slot, if you insert it into wrong slot notification will be shown that you should use read slot instead of write one.
2014-07-20 10:38:00 -04:00
Atlantiscze
74caaea9ab Fixes #5553
Camera network key itself is useless without security camera program. Created hidden version of this program and added it to each laptop. In short: it works.
2014-07-20 10:37:34 -04:00
Atlantiscze
c63317e9d4 Fixes #5570
Also de-copypasted charger code, as i had the opportunity.

Conflicts:
	code/game/machinery/recharger.dm
2014-07-20 10:36:33 -04:00
ZomgPonies
5919243efd Compile fix 2014-07-20 06:03:32 -04:00
Walter0o
db44fbe5ee adds trim() to OOC and LOOC 2014-07-20 05:58:26 -04:00
Walter0o
238c198def fixes simple_animals using FEA instead of ZAS
i can't believe after all this time animals still use FEA instead of ZAS.
this should fix the "random" animal deaths.
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
2014-07-20 05:58:01 -04:00
Whitellama
f701f5d6dd Fixed #5685: Changelings now gain the species needed to transform when acquiring DNA using the extract DNA sting 2014-07-20 05:56:19 -04:00
Whitellama
c231899b05 Eating with utensils now produces the eating sound, fixed #5687 2014-07-20 05:56:06 -04:00
Walter0o
fc0e08cbae should fix #5692
untested, but seems like a simple derp bug
2014-07-20 05:55:21 -04:00
Walter0o
06fa834c29 blocks hallucination on clientless mobs
why bother calculating all those things for clientless mobs ?
2014-07-20 05:54:52 -04:00
Walter0o
adef8d0f06 streamlining dreams
no calling by clientless mobs, this should save several thousand wasted calls.
turning the massive string list that would be defined each call into a global list.
the chance the same dream gets picked twice is negletable.
Conflicts:
	code/modules/flufftext/Dreaming.dm
2014-07-20 05:54:37 -04:00
ZomgPonies
70469f7199 Fixed welding and shortsighted overlays 2014-07-20 05:18:59 -04:00
ZomgPonies
4e1d24609f Fireball explosion fixes 2014-07-20 04:31:32 -04:00
ZomgPonies
681ab587ad Stupid bug with the way mages are counted. 2014-07-20 04:08:33 -04:00
ZomgPonies
8bf4fc4418 More faction stuff for wizards 2014-07-20 03:52:40 -04:00
ZomgPonies
dd720d4bfb No more magic missiling fellow wizards or your apprentice. 2014-07-20 03:39:03 -04:00
ZomgPonies
ef7db2b807 Merge pull request #308 from mwerezak/paradise-docking
Fixes Special Operations shuttle having wrong initial tag set
2014-07-20 02:35:10 -04:00
ZomgPonies
c5785ee171 Re-add borers to potential random events 2014-07-20 02:26:42 -04:00
Walter0o
1bf157d4cc borer detatch fixes
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
2014-07-20 02:20:16 -04:00
Walter0o
503cffaf96 borer detatch fixes 2014-07-20 02:14:14 -04:00
Walter0o
5c264d9ae3 fixes borer infest and detatch
Conflicts:
	code/modules/mob/living/simple_animal/borer.dm
2014-07-20 02:13:58 -04:00