Commit Graph

6116 Commits

Author SHA1 Message Date
Erthilo
fe59af1a14 Gah, didn't save these. 2012-06-09 01:53:54 +01:00
Erthilo
13d5ed0fff Randomises blob weakness/strengths. Hitting the blob with a something it's weak too will do MASSIVE DAMAGE. Hitting it with something it's resistant too will either do very little, or heal it. 2012-06-09 01:39:21 +01:00
Erthilo
63dacbe43c Merge pull request #1270 from Erthilo/master
Comments out metroid retrovirus.
2012-06-08 15:21:02 -07:00
Erthilo
ff48abe38a Comments out metroid retrovirus. 2012-06-08 23:17:27 +01:00
SkyMarshal
0cc2d20a33 Merge branch 'master' of git://github.com/Aryn/Baystation12 into BugFixes
Conflicts:
	code/ZAS/Airflow.dm
2012-06-08 11:37:43 -07:00
Aryn
5af672c92f Fixed a runtime in airflow, made it so that stuff doesn't fly around every 3.5 seconds. 2012-06-08 10:46:38 -06:00
Aryn
6730a1bf22 Modified fire algorithms, made bombs possible. 2012-06-08 10:45:47 -06:00
SkyMarshal
f17525173c Plasma and welder fuel no longer create stupid amounts of plasma in the air. 2012-06-08 04:09:49 -07:00
SkyMarshal
0a83532232 Airflow runtime/bugfix. 2012-06-08 03:53:27 -07:00
SkyMarshal
157ea3000d Fix for runtimes, DERP. 2012-06-08 03:23:32 -07:00
SkyMarshal
8a1c28a302 Made the sanity checks on rebuilding zones more rigorous, and less infinite-loopy 2012-06-08 02:30:05 -07:00
SkyMarshal
6b8ff34f61 San check for rebuilding zones. Just crashed the server. 2012-06-08 02:10:32 -07:00
SkyMarshal
f23d3a0a1e Airflow now takes more air to stun you, and slamming into an object while being pushed by airflow will stun you. 2012-06-08 01:56:35 -07:00
SkyMarshal
77c8367b68 Derp, airlocks without a turf beyond them now suck you out. Can't believe I missed this bit. 2012-06-08 01:43:33 -07:00
SkyMarshal
dd4f191f28 Removed a bunch of tag variables from the map. I hate whoever added those.
Final parts to ZAS.  Works 100% (Or very near such) now.
2012-06-08 00:28:47 -07:00
SkyMarshal
a1a2302199 ZAS fixes, adds Atmos Lockdown which replaces all door accesses with engineering OR atmos access. (And a shitty temporary icon) 2012-06-07 20:50:42 -07:00
SkyMarshal
36a32c9fef Merge pull request #1264 from Erthilo/master
Meteor fixes + Engineer spacesuit fixes + missing custom item
2012-06-07 16:31:42 -07:00
Erthilo
791bf42c24 Missed Botanist from the custom_items.txt 2012-06-08 00:29:36 +01:00
Erthilo
658edb881e Fixes engineering space suit helmets. 2012-06-08 00:29:19 +01:00
Erthilo
e2461de008 Fixes meteors never appearing. The problem was the edge transition code deleting them before they could move. So, no meteors. 2012-06-08 00:28:57 +01:00
SkyMarshal
806833989c Merge pull request #1263 from Erthilo/master
Searifs and Botanists custom items.
2012-06-07 15:18:28 -07:00
Erthilo
d7692a9d45 Searifs and Botanists custom items. 2012-06-07 22:50:40 +01:00
SkyMarshal
9f721a3209 Merge pull request #1262 from Erthilo/master
Anti-meta update for syndicate items + some message fixes + lagfixing
2012-06-07 14:19:27 -07:00
Erthilo
d2078fafb0 Lag fix for update_face and the bald helmet bug. Should reduce the number of time update_face is called. 2012-06-07 22:14:50 +01:00
SkyMarshal
2892ea733e More changes for ZAS. Firelocks work properly, and rebuilding zones occurs at the proper times. 2012-06-07 13:43:55 -07:00
Erthilo
086a8fef37 Anti-meta update. Renames and re-icons a bunch of syndicate items to reduce meta from names and examine messages. 2012-06-07 19:54:37 +01:00
Erthilo
add8427d96 Fixes some watering can messages for hydroponics. 2012-06-07 19:53:07 +01:00
SkyMarshal
d9fd228c68 Some nice fixes for ZAS. 2012-06-07 10:36:43 -07:00
SkyMarshal
6265a600e3 Made firelocks work right with ZAS. 2012-06-07 03:14:14 -07:00
SkyMarshal
32c0c5c625 Changelog 2012-06-07 01:41:15 -07:00
Albert Iordache
59a068e8fa Update master 2012-06-07 11:32:36 +03:00
SkyMarshal
f309eb0263 Merge pull request #1259 from SkyMarshal/BugFixes
Changelog
2012-06-07 01:25:06 -07:00
Albert Iordache
bf0eb0fc81 Merge pull request #1258 from SkyMarshal/BugFixes
Debugged ZAS.  Removed another duplicate proc.  Made sure turf changes are added to the air_master to be updated.
2012-06-07 01:24:03 -07:00
SkyMarshal
2508cadf07 Changelog 2012-06-07 01:23:53 -07:00
SkyMarshal
1059311b5b Debugged ZAS. Removed another duplicate proc. Made sure turf changes are added to the air_master to be updated. Fixed errors on the map causing problems. Added different sized packages. Airflow readded. 2012-06-07 01:15:14 -07:00
SkyMarshal
8e2112709b Merge pull request #1252 from Erthilo/master
Tajaran/Soghun balancing. Adds Searif to Skrell whitelist (He is the creator after all).
2012-06-06 20:53:47 -07:00
Erthilo
3bf97d244e Comments out control_freak again, since it didn't stop any Topic exploits, and prevented using the profiler. 2012-06-07 04:50:03 +01:00
Erthilo
c3fc297146 Fixes hair not coming back after using a BLOCKHIAR mask/helmet. 2012-06-06 22:50:25 +01:00
Erthilo
f0a52a0d68 Grammar fixes for storage items. 2012-06-06 22:04:42 +01:00
Erthilo
36708dcfa9 Adds examine text for Soghun/Skrell. 2012-06-06 22:04:30 +01:00
Erthilo
18814e23c1 Tajaran/Soghun balancing. Adds Searif to Skrell whitelist (He is the creator after all).
* Reordered alien whitelist. I mean, someone was on there twice!

* Tajarans get hungry 1.25 times as fast.
* Tajarans move slightly faster when cold.
* Tajrans heat up quicker, but cool slower.

* Soghuns get hungry 0.5 times as fast.
* Soghuns move slightly slower when cold.
* Soghuns heat up slower.
2012-06-06 21:22:28 +01:00
SkyMarshal
d8f966e2ef Fix for title of paper, when printing a dossier. 2012-06-06 11:17:54 -07:00
SkyMarshal
73e8328da1 A sanity check and some improvements (again) to the optimization on explosions. 2012-06-06 11:13:17 -07:00
SkyMarshal
7bd1c27d2b Commented and further improved explosions. 2012-06-06 10:39:45 -07:00
Albert Iordache
cf65bbbcbf Merge pull request #1250 from SkyMarshal/BugFixes
Commented and further improved explosions.
2012-06-06 10:38:01 -07:00
SkyMarshal
09c59064d2 Commented and further improved explosions. 2012-06-06 10:35:37 -07:00
Albert Iordache
4ba8eae9fd Merge pull request #1245 from Erthilo/master
Skrell Update + Digital Valve Fixes + Atom/Del() Logging + General Fixes
2012-06-06 09:55:46 -07:00
CIB
ad0c999ef5 Merge pull request #1249 from SkyMarshal/BugFixes
Optimized explosions.
2012-06-06 02:36:58 -07:00
SkyMarshal
f03b176128 Optimized explosions. 2012-06-06 02:35:00 -07:00
SkyMarshal
38cc30938c Merge pull request #1248 from SkyMarshal/BugFixes
Some sanity (to a stupid degree) on flood filling turfs.
2012-06-06 01:55:31 -07:00