Fox-McCloud
b095f866df
Chemistry Balance
2015-03-24 00:33:24 -04:00
Fox-McCloud
1d30096eab
tweak
2015-03-24 00:03:33 -04:00
SamCroswell
a6f251574a
Adds an observer message for vampires combusting
2015-03-23 22:20:22 -04:00
SamCroswell
b1ae7d37c3
Vampire Holy Water Balancing
2015-03-23 22:14:48 -04:00
Mark van Alphen
bd1e58aa0e
Merge pull request #632 from SamCroswell/master
...
Adds Admin Boozes
2015-03-24 02:45:44 +01:00
fj45
145fbe1456
Mechanics workshop, take two!
...
http://i.imgur.com/pIpc9gA.png
Isn't an exact picture, but its pretty close, just missing the new
fabricator unit and a few bits moved around.
Note that the mechanics workshop still isn't how I would like it, if
someone with more skill then me could have a crack at properly
overhauling that entire area it would be great.
2015-03-24 08:05:12 +08:00
Fox-McCloud
69bc15604d
Health Analyzer Upgrading
2015-03-23 19:44:06 -04:00
ZomgPonies
56de2ab011
Merge pull request #631 from tigercat2000/SpessPodUpdates
...
Massive spacepod construction overhaul by /VG/
2015-03-23 16:53:13 -04:00
ZomgPonies
cc14140773
Merge pull request #639 from Fox-McCloud/Airflow
...
Airflow Damage Hotfix
2015-03-23 16:51:40 -04:00
Fox-McCloud
14ae3d22dd
Airflow Damage Hotfix
2015-03-23 15:27:07 -04:00
ZomgPonies
a45c9b987d
Merge pull request #633 from Fox-McCloud/Best-Emag-Use
...
Fixes There Not Being a Best Emag Use
2015-03-23 11:13:44 -04:00
ZomgPonies
a9658989b6
Merge pull request #629 from tigercat2000/portgetPixelDistance
...
Ports getPixelDistance() from -tg-
2015-03-23 11:13:26 -04:00
Mark van Alphen
b7831c543b
Merge pull request #611 from Fox-McCloud/ZAS-Tweaks
...
ZAS Tweaks
2015-03-23 15:38:48 +01:00
Mark van Alphen
69fb729dc1
Merge pull request #626 from Fox-McCloud/Guns-Fixes
...
Teleporter Gun, Fixes, and Tweaks
2015-03-23 15:38:44 +01:00
Mark van Alphen
98f06c5d4d
Merge pull request #627 from tigercat2000/ChaplainNERRFSS
...
Allow Chaplain to bless beakers by inserting them into his bible
2015-03-23 15:38:40 +01:00
Mark van Alphen
f8605bd406
Merge pull request #608 from Fox-McCloud/Temporary-Fires
...
New Feature: Temporary Fires, Napalm Rework, and Dragon's Breath Round Fix
2015-03-23 15:38:28 +01:00
Tigercat2000
2f0c9950ef
Increase weapons costs
2015-03-23 11:43:55 +01:00
Tigercat2000
8519d592b4
Update to Fox's specifications
2015-03-23 11:39:39 +01:00
Fox-McCloud
aa5cdae070
Taperecorder Rework
2015-03-23 05:45:15 -04:00
Fox-McCloud
4391367e56
Merge pull request #634 from fj45/master
...
Sec/Service Solars, Take 2
2015-03-23 05:07:18 -04:00
fj45
cdae1862fa
Sec/Service solars update take 2.
...
http://i.imgur.com/PSvEPb2.png
Same as last time, just with 100% less merge conflicts!
2015-03-23 16:39:38 +08:00
fj45
9adb7e045d
Merge https://github.com/ParadiseSS13/Paradise
2015-03-23 15:52:44 +08:00
fj45
365bcbd5a8
Revert "Fancier solars by sec/service."
...
This reverts commit 791510c437
2015-03-23 15:50:19 +08:00
fj45
c43d71ad30
Revert "Missed a few rogue solar areas."
...
This reverts commit 2be569a0cc
2015-03-23 15:49:45 +08:00
Fox-McCloud
c576402ea9
Fixes There Not Being a Best Emag Use
2015-03-23 01:06:19 -04:00
SamCroswell
02638d1a60
Adds admin boozes
2015-03-22 21:54:49 -04:00
Tigercat2000
76ffbbfd59
Massive spacepod construction overhaul by /VG/
2015-03-23 02:36:49 +01:00
Fox-McCloud
5de7506e84
pre-emptive fix
2015-03-22 21:06:50 -04:00
Fox-McCloud
cedb71e8af
Clarity
2015-03-22 20:18:01 -04:00
Fox-McCloud
8da3cb1de5
Merge pull request #616 from tigercat2000/BorgIlocker
...
Allow borgs to open-close lockers properly
2015-03-22 18:00:35 -04:00
Fox-McCloud
9f59b20303
Merge pull request #624 from Artorp/meat
...
Fixes meat harvesting of some simple_animals
2015-03-22 17:59:48 -04:00
Fox-McCloud
2d4f754edb
Merge pull request #628 from tigercat2000/FixStatueClick
...
Add clickdelay to attacking statues & lights
2015-03-22 17:59:00 -04:00
Fox-McCloud
ccdde7488e
Merge pull request #620 from TheDZD/mapping
...
Moves Arrivals Carpspawns
2015-03-22 17:58:35 -04:00
Fox-McCloud
b444ec3f09
Merge pull request #619 from TheDZD/applepocalypse-prevention
...
Applepocalypse Prevention
2015-03-22 17:58:19 -04:00
Fox-McCloud
96ec2936e4
Merge pull request #630 from tigercat2000/GiveSanitycheck
...
Fix giving things to non-carbons
2015-03-22 17:58:05 -04:00
Tigercat2000
7b84658a33
Fix giving things to non-carbons
2015-03-22 19:50:55 +01:00
Tigercat2000
6f067db90c
whoops left a conflict in
2015-03-22 18:53:25 +01:00
Remie Richards
0d2d2ddb71
Adds getPixelDistance()
...
Adds a proc for finding the distance between two atoms, in pixels
Conflicts:
code/__HELPERS/unsorted.dm
2015-03-22 18:50:09 +01:00
Tigercat2000
86f8ed5111
Fixes related issue with spamclicking lights
2015-03-22 18:36:54 +01:00
Tigercat2000
689713ddbd
Add clickdelay to attacking statues
2015-03-22 18:24:20 +01:00
Tigercat2000
9a19420ac3
Fix spelling error
2015-03-22 15:39:25 +01:00
Tigercat2000
c40c37390f
Allow Chaplain to bless beakers by inserting them into his bible
2015-03-22 15:29:37 +01:00
fj45
2be569a0cc
Missed a few rogue solar areas.
2015-03-22 15:22:22 +08:00
Fox-McCloud
d9a257c890
Teleporter Gun, Fixes, and Tweaks
2015-03-22 02:45:02 -04:00
Artorp
e7434672bc
Fixes meat harvesting of some simple_animals
2015-03-22 05:08:32 +01:00
fj45
791510c437
Fancier solars by sec/service.
...
http://i.imgur.com/PSvEPb2.png
Shouldn't change anything apart from how the solars look. I hope.
2015-03-22 12:08:02 +08:00
Fox-McCloud
82f3bbedb4
Merge pull request #603 from SamCroswell/mapEdits
...
Blueshield Carpet, Black Shuttle Windows
2015-03-21 21:41:43 -04:00
SamCroswell
7456e09b7b
Merge Conflict Resolution
...
Conflicts:
maps/cyberiad.dmm
2015-03-21 20:04:09 -04:00
DZD
c66ba2a3e6
Removes and Redistributes Arrivals Carpspawns
2015-03-21 15:45:06 -04:00
DZD
bd863d0d89
Applepocalypse Prevention
...
- Nutriment is no longer insanely good for increasing a hydroponics
tray's yield_mod, it's now marginally worse than robust harvest, which
is marginally more difficult to make.
- yield_mod is now capped at 100, no more getting 2000+ items out of one
harvest.
2015-03-21 15:23:28 -04:00
