Commit Graph

6413 Commits

Author SHA1 Message Date
CIB
c72038d4b2 Merge pull request #1365 from SkyMarshal/BugFixes
Lots of fixes for derped up while loops (In an attempt to destroy the crashing), and changed flavor text for auto-fire-mode shooting guns stuff.
2012-06-22 15:02:27 -07:00
cib
55291ca837 Removed the automatic reboot stuff from server_controller.py 2012-06-22 14:42:48 -07:00
SkyMarshal
f3b9285f05 Guns now have a different message for when they are fired by the auto-fire-mode. 2012-06-22 14:27:21 -07:00
cib
f612b70a57 Merge branch 'master' of github.com:CIB/Baystation12 into DLL 2012-06-22 14:12:31 -07:00
cib
ae659b251e Added a socket_talk option to the config. 2012-06-22 14:11:45 -07:00
cib
7b0b71dc4e Fixed a compile error. 2012-06-22 14:11:18 -07:00
SkyMarshal
616be6eed8 More while loop stuff, removed shitloads of unnecessary curly brackets in the map reader, fixed ED-209 projectiles 2012-06-22 14:10:48 -07:00
cib
c859b1b021 Fixed .dme derp 2012-06-23 01:00:38 +04:00
cib
4cfbf31ab5 Rewrote server_controller.py functionality 2012-06-22 13:58:30 -07:00
cib
5ea5af38d7 Another linux compile fix. 2012-06-23 00:52:58 +04:00
cib
525d068138 Merge branch 'DLL' of git@github.com:CIB/Baystation12 2012-06-23 00:51:42 +04:00
cib
6caeb52b4c Linux compile-fix for DLLSocket/main.cpp 2012-06-22 13:50:28 -07:00
cib
5caee09082 Linux compile-fix for DLLSocket/main.cpp 2012-06-22 13:40:43 -07:00
cib
02e7f30a9e Refined the BYOND-side socket_talk interface 2012-06-22 13:37:50 -07:00
SkyMarshal
668f81c329 Some tweaks and fixes for UL and any while loops I find, as well as removing generally bad procs. 2012-06-22 12:50:45 -07:00
Albert Iordache
f4ba1a40c3 Merge pull request #1364 from caelaislinn/master
missing items in the anom lab
2012-06-22 11:38:36 -07:00
caelaislinn
a36a6df1f7 forgot to add devices/batteries
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 04:37:13 +10:00
Albert Iordache
56e40cf7b5 Merge pull request #1363 from caelaislinn/master
multiple anomaly updates
2012-06-22 11:30:09 -07:00
caelaislinn
2fbd7758bc Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	maps/tgstation.2.0.8.dmm

removed misplaced light, fixed couple of mapping errors in viro

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 04:27:42 +10:00
caelaislinn
0e21ed125a artifacts can be harvested and reused in a portable emitter, restructured artifacts, artifact analyses should go a lot smoother and faster now, additional bugfixes in general, moves some icons around to hopefully fix some bugs, additional strange rock formations should spawn now, dbs should work now, reworked the anomaly lab, redacted
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 04:16:09 +10:00
Albert Iordache
dcb05f5335 Removed a light placed inside a wall 2012-06-22 21:12:08 +03:00
Albert Iordache
ddf5aea663 Updated config/alienwhitelist.txt 2012-06-22 20:40:12 +03:00
Mloc
149eb05a61 Merge pull request #1362 from caelaislinn/master
bunch of fixes for anomaly
2012-06-22 08:43:38 -07:00
Cael_Aislinn
81714b9b0b more arty tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-06-23 01:42:36 +10:00
Cael_Aislinn
952f240d4e fix for unable to find pad >.>
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-06-23 01:32:30 +10:00
Cael_Aislinn
835b1f2567 some more fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-06-23 01:17:21 +10:00
Cael_Aislinn
6b61a58d2d fixes for (hopefully) some of the bugs that came up over the last few rounds
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-06-23 00:59:27 +10:00
Albert Iordache
167372833b Boosted the minimum and max power of light tubes 2012-06-22 15:46:54 +03:00
cib
610353c2a2 Started implementing the socket_talk API 2012-06-22 01:10:39 -07:00
cib
e2e31c1164 Small improvements to DLLSocket 2012-06-22 01:09:21 -07:00
cib
ee5a8ec719 Added a sample python file to interact with the BYOND socket interface. 2012-06-22 00:50:31 -07:00
cib
d60c8faecc Merge branch 'master' of github.com:Baystation12/Baystation12 into DLL 2012-06-22 08:49:19 -07:00
cib
0aa6319da1 Began work on a DLL for communicating with other processes through sockets. 2012-06-22 08:41:00 -07:00
cib
a61f2b1a4c Removed ticker debugging again. 2012-06-22 08:15:25 -07:00
cib
265c086491 And forgot a file. 2012-06-22 07:12:33 -07:00
cib
83a1c27e3c BYOND, y u no save .dme on "Save all" 2012-06-22 07:10:44 -07:00
cib
f2313852d7 Added admin reporting. 2012-06-22 07:01:03 -07:00
cib
18d305341c Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-22 06:51:15 -07:00
cib
bbf735a00b Moderators can now identify antagonists. 2012-06-22 04:46:05 -07:00
cib
19cf03546c Master controller debugging for crashes.
Warning: This can cause up to 100 writes to a file per second, which may cause notable CPU consumption. Should remove this, or replace it with a C DLL at some point.
2012-06-22 04:18:00 -07:00
Albert Iordache
506eb57979 Merge pull request #1358 from caelaislinn/master
anom tweaks
2012-06-21 23:35:17 -07:00
caelaislinn
d5821ddb99 artifact tweaks, added artifact catalogue database to anom lab
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 16:31:43 +10:00
Albert Iordache
4b5cc15d6b Merge pull request #1356 from caelaislinn/master
anomaly tweaks
2012-06-21 23:17:55 -07:00
CIB
21e8e2f84c Merge pull request #1357 from CIB/master
Removed ticker debugging
2012-06-21 23:16:42 -07:00
caelaislinn
b79d5253b0 gloves now prevent on-touch artifacts from activating, anomaly suits are pressure resistant, fixed door in anom lab
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 16:09:09 +10:00
SkyMarshal
8cab2a35cb Merge pull request #1354 from caelaislinn/master
missing icon file
2012-06-21 22:43:06 -07:00
caelaislinn
dcac285964 another missing icon
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 15:24:05 +10:00
caelaislinn
71ff133fca missing icon file
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 15:22:34 +10:00
CIB
7dedda0a3e Merge pull request #1353 from CIB/master
And forgot a file
2012-06-21 22:13:20 -07:00
CIB
3f4be0f326 Merge pull request #1352 from CIB/master
Silly .dme fix
2012-06-21 22:12:08 -07:00