cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 04:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,920 Commits 5 Branches 0 Tags
18f6136b25cde059c5964d3810c07877ef3032c8
Commit Graph

9122 Commits

Author SHA1 Message Date
Cael_Aislinn
18f6136b25 tweaked a couple of supply packs (crate types, quantities), added missing rust fuel port circuitry supply pack, added supply packs for type 1 TEGs and circulators 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:33:59 +10:00
Cael_Aislinn
efd586a9e1 added large metal crates (secure and normal variants) to be resprites of normal crates 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:32:28 +10:00
Cael_Aislinn
92517638bc removed double announcement for grid checks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:31:40 +10:00
Cael_Aislinn
00b0c09016 core gens start locked, added placeholder core monitor file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:29:48 +10:00
Cael_Aislinn
c5f461e90d circulators and type 1 gens are now rotateable/moveable, also made the operation of gens/circs much more generalised to allow for greater flexibility in setup (this makes type 2 gens incompatible with the circs, but i'll update them later) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 01:28:57 +10:00
Cael_Aislinn
2933069ebe Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:23:16 +10:00
Cael_Aislinn
950c5a84ab updated roundstart music 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:15:12 +10:00
Cael_Aislinn
6f9542cd10 removed debug output for type 2 TEGs 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 17:06:43 +10:00
Cael_Aislinn
9ca69998d0 cleaned up/added some missing icon_states for (rust) engineering areas 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:51:09 +10:00
Cael_Aislinn
09399cb74b some tweaks and balances to rust circuit research levels 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:47:26 +10:00
Cael_Aislinn
c6398d6d52 fixed some core field runtimes, made it actually process 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:41:10 +10:00
Cael_Aislinn
e511bf954e fixed icon + useability + construction issues for misc rust components, removed debug output for TEGs, made injectors no longer directwired 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:23:59 +10:00
Cael_Aislinn
53cfbaa480 tweaked some rust icons 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-05 16:22:35 +10:00
cib
b25a6cb9bb Typofix 2013-03-05 04:25:21 +01:00
cib
aa4deb2b89 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2013-03-04 12:20:38 +01:00
cib
65b8eafe8e Added internal organs. 
They can be hurt by their parent organ getting hurt.

Ruptured lungs are now represented as damage to the lungs internal organ.
 2013-03-04 12:19:12 +01:00
Zuhayr
6c15bb5bfa Forgot to update the emag code so that the bots explode. 2013-03-04 04:14:44 -08:00
Zuhayr
810c9bea70 Added verbs to spiderbot, tweaked access. 2013-03-04 03:26:52 -08:00
Zuhayr
cbc62505e7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-03-04 01:52:12 -08:00
cib
997c1e63ad Fix for too many changelings. 2013-03-02 19:59:16 +01:00
Christian Bielert
2a9f199441 Merge pull request #2469 from Uristqwerty/Tubes 
Added: Code and icons for tube-based transportation.
 2013-03-02 09:37:01 -08:00
Uristqwerty
b455c42d96 Added: Code and icons for tube-based transportation. 
Just an additional tool that mappers may find interesting or fun. At the moment, they do not use power or any resources, and there is plenty of room to extend and improve them, but they do work.

The basic tubes will read their directions from icon_state if they aren't specifically specified, so you can just use the built-in option to generate instances from icon states to get all possible tubes.
The tube stations use directions, instead.
 2013-03-02 04:17:58 -05:00
cib
df01f9dee6 Merge branch 'master' of github.com:Baystation12/Baystation12 into feature 2013-03-02 01:11:24 +01:00
Christian Bielert
65ff5dc7f9 Merge pull request #2460 from Gamerofthegame/bleeding-edge-freeze 
Medical hardsuit changes
 2013-03-01 16:07:00 -08:00
Christian Bielert
a211b493c8 Merge pull request #2465 from Zuhayr/bleeding-edge-freeze 
Spiderbots and a bunch of commits from master.
 2013-03-01 16:05:17 -08:00
Zuhayr
3774b16839 Made spiderbots buildable, animated spiderbot sprites. 2013-03-02 02:15:39 -08:00
Zuhayr
48fefead00 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:38 -08:00
Zuhayr
ad47e954ce Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-03-01 23:15:19 -08:00
Zuhayr
e17038636f Added spiderbots! Adminspawn only currently. They take an occupied MMI or posibrain, can crawl through vents and hide, shock people, and go 'beep'. 2013-03-01 14:28:58 -08:00
Jim "Apples"
2064f57dc0 Merge pull request #2464 from caelaislinn/bleeding-edge-freeze 
added an admin proc to check for any inactive players with custom items
 2013-03-01 07:22:21 -08:00
Zuhayr
15984f6a14 Fix for posibrains, modification to posibrain brainmob for admin use, updated posibrain sprites, addition of spiderbot sprites for a later project. 2013-03-01 01:38:32 -08:00
Cael_Aislinn
30a34bbc9f added an admin proc to check for any inactive players with custom items 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 19:15:27 +10:00
Zuhayr
6569388d9f Map conflict, using bef. 2013-02-28 23:22:36 -08:00
Chinsky
b3ad6e989f Merge pull request #2454 from CIB/feature 
Department accounts are created now and credentials given to heads.
 2013-02-28 11:45:49 -08:00
Cael_Aislinn
533794b0db some useability tweaks to atms 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:45:33 +10:00
Cael_Aislinn
4633373d1f fixed an issue with database reconnection 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:23:22 +10:00
Cael_Aislinn
67a4a94896 atm fix mk 2 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-01 00:15:17 +10:00
Spamcat
c9e657a4c6 Reloading spent casings in the revolver doesn't duplicate "This one is spent" message 
Fixed #2434.
 2013-02-28 17:07:20 +04:00
Spamcat
9894ce73d5 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-28 13:48:44 +04:00
Spamcat
c4c31fd657 You can now switch off cameras. 
Fixes #2394.
 2013-02-28 13:46:56 +04:00
Gamerofthegame
a2cfc456c0 Removes Medical's random slowdown and faulty coding. 2013-02-27 22:07:30 -05:00
Gamerofthegame
f3ba4e4ec6 Opens the ERT debug-command preset for actual use. 2013-02-26 21:25:48 -05:00
Cael_Aislinn
43ebfd1fdd tweakfixes to finances 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-27 11:55:28 +10:00
cib
0876d6f913 Added extra safety check. 2013-02-27 02:48:49 +01:00
cib
26b4deb33f Department accounts are created now and credentials given to heads. 2013-02-27 01:55:18 +01:00
RavingManiac
e84d739fac Condensed capsaicin effects increased to pre-merge levels. 2013-02-26 12:58:44 +08:00
Christian Bielert
80b9257332 Merge pull request #2446 from Baystation12/BEF-staging 
Bef staging
 2013-02-25 09:58:25 -08:00
Chinsky
b143022084 Merge pull request #2445 from CIB/feature 
Fixed anti-depressants
 2013-02-25 09:44:18 -08:00
cib
19e176e2ff Fixed paroxetine. 2013-02-25 18:40:42 +01:00
cib
f2f2ce12ea Fixed citalopram. 2013-02-25 18:39:20 +01:00