Commit Graph
4925 Commits
Author SHA1 Message Date
caelaislinn 613c9457ed shielding circuitboards should be buildable now
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-06 11:17:58 +10:00
caelaislinn 6d51e57702 artifact files moved to new folder to avoid clutter, mining north outpost repurposed as research outpost, shuttle dock added to research wing (both shuttle dock and outpost require standard research access), modified layout of the anomaly lab slightly 2012-07-05 23:47:35 +10:00
caelaislinn 1af96105c0 shield generator circuitboard added
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-05 23:44:00 +10:00
caelaislinn 9d6f45e806 shield capacitors can now be rotated correctly
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-05 23:43:43 +10:00
caelaislinn 7f21c4530a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-05 20:28:54 +10:00
Erthilo 8acd06ddda Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-07-04 09:00:59 +01:00
caelaislinn 14a7e0da20 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-03 20:55:13 +10:00
Albert Iordache ca09b7774c Merge pull request #1410 from comma/master
Small things
2012-07-03 02:38:51 -07:00
caelaislinn 05955007ce Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-02 18:49:28 +10:00
CIB 124b27d2e8 Merge pull request #1424 from Drieden/master
Fixed the supply depot for good this time.
2012-07-01 20:06:43 -07:00
caelaislinn cfb1bf3111 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-01 19:44:34 +10:00
CIB 04fe3dedd6 Bugfix: It was impossible to flag admin reports as handled. 2012-06-30 23:59:54 +03:00
Drieden c59c35397b Some supply depot improvements and bug fixes. 2012-06-30 09:45:37 -04:00
unknown b0cb325bb6 Fixed a derp 2012-06-30 14:16:04 +03:00
unknown 427d409113 Merge branch 'master' of git://github.com/Baystation12/Baystation12 2012-06-30 13:43:08 +03:00
Erthilo a2ed0517e4 Reverts job numbers to default. Added spawn points to map. 2012-06-29 19:13:45 +01:00
Apple_Master 6102489138 Added Jamini and Cubejackal's custom items. I hope.
Signed-off-by: Apple_Master <cheeckan@gmail.com>
2012-06-29 16:44:03 +01:00
caelaislinn a8c727ba1a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-30 01:18:33 +10:00
Drieden 7a92faa3e9 Fixed a typo. 2012-06-29 04:56:18 -04:00
CIB 4065470e00 Merge pull request #1415 from Erthilo/master
Bugfixes 2: Electric Boogaloo
2012-06-28 22:15:39 -07:00
Erthilo 0e6c0cfac4 Fixed and improved body scanner, fixed derpy airlock cycling on the map. 2012-06-29 03:28:58 +01:00
Erthilo f4b5961add Added notification for non-whitelisted people. Also updated whitelist with Spaceman96 2012-06-29 03:28:26 +01:00
Erthilo 991e11b30d Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-29 02:56:59 +01:00
Erthilo 2f6af975de Fixes extra description damage values. 2012-06-29 02:32:32 +01:00
Erthilo f5b221bb63 Fixes a few places where if statements wouldn't work due to syntax errors. 2012-06-29 02:31:46 +01:00
Erthilo a6607a0275 De-yellows blubs sligtly. 2012-06-29 02:25:57 +01:00
Erthilo 079f987c5c Fixes moderators getting verbs they can't use. 2012-06-28 22:59:36 +01:00
Erthilo 95bae4da54 Fixes AI holopad speech not being picked up by tape recorders. 2012-06-28 22:33:07 +01:00
Erthilo 83542c9955 Fixes alien language indicators being overriden. 2012-06-28 22:32:25 +01:00
Erthilo 73e2b5f5c2 Hotfix for stun batons harming on all non-help intents. 2012-06-28 22:31:16 +01:00
Erthilo f694e99abb Hotfix for Exosuit Fabricators not syncing. 2012-06-28 22:30:38 +01:00
Erthilo ec6851f785 Ghosts can now understand everyone. 2012-06-28 22:29:46 +01:00
Erthilo ae63e9ec9f Mind Transfer now requires wizard garb. 2012-06-28 19:56:20 +01:00
Rob Palkowski 479705ae60 Response to server probe no longer always gives a null host name. 2012-06-28 10:51:39 -07:00
caelaislinn 4a4d3b0614 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-28 22:56:29 +10:00
headswe 7f3f456207 Merge pull request #1411 from Erthilo/master
Fixes + Whitelist Update
2012-06-28 04:16:22 -07:00
Erthilo 0890ad5791 Merge pull request #1405 from Drieden/master
Added raw materials depot to cargo bay
2012-06-28 01:14:40 -07:00
caelaislinn e00ddfe0fd Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-28 13:04:35 +10:00
Erthilo 4f6ec49558 Fix wallet not being made by the biogenerator. 2012-06-28 01:54:09 +01:00
Erthilo 34e4ba4750 Only chairs with wheels now work with fire extingusihers. 2012-06-28 00:01:58 +01:00
Erthilo 5b13fbc6a7 Temp/quick/hotfix for evidence bags. 2012-06-27 23:36:55 +01:00
Erthilo 73ba4c7f0f Readjusted Medical items heal caps. 2012-06-27 23:36:38 +01:00
Erthilo 0c1e3f3cc4 Fixes PDA's being unusable when buckled but not handcuffed. 2012-06-27 23:36:18 +01:00
Erthilo c779f84d69 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-27 22:35:19 +01:00
Erthilo 92b7eb534a Fixes sleeping resting message spam. 2012-06-27 22:34:55 +01:00
Erthilo 109045a02a Merge pull request #1398 from sick-trigger/patch-1
Air alarm vent pressure controls increment properly.
2012-06-27 14:32:13 -07:00
Erthilo e37049eee1 Fixes Tajaran spawning as humans. 2012-06-27 22:21:39 +01:00
Erthilo 740bf13cec Changes mech part weight from 20 to 5. 2012-06-27 21:25:33 +01:00
unknown 869a82a3e3 Clipboards changes
+Added 'Rename' function
+Added ability to add photos to clipboards

%Fixed linebreaks not being replaced with <br> when viewing paper from clipboard

Signed-off-by: Chinsky <comma@nano.(none)>
2012-06-27 23:12:09 +03:00
Erthilo 1e63e35ab4 Fixes double icons in examine, and random " on his head" " on his groin" messages. 2012-06-27 20:29:40 +01:00