cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,608 Commits 8 Branches 0 Tags
f29cd5946fadaf5099d619d90dde4fc679b6c687
Commit Graph

10219 Commits

Author SHA1 Message Date
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
Mloc
2288dc8abf Merge pull request #3318 from SkyMarshal/airfixes 
Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring.
 2013-07-14 16:12:53 -07:00
SkyMarshal
46f808edf4 Hypothetically fixed two issues, both the airlock issue and ZAS not detecting the runtime that was occuring. Should still be verified on the live server before considered resolved. 2013-07-14 16:09:30 -07:00
LordBraindead
5d63943d07 Update mineral.dm 
removed sheettpye = "plastic" again because it snuck back in after being removed already
 2013-07-14 21:50:48 +02:00
LordBraindead
53c73f6b85 Update power_cells.dm 
derped a debug message into the commit
 2013-07-14 21:22:09 +02:00
LordBraindead
08d2e22220 fire update 
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
 2013-07-14 21:20:45 +02:00
Zuhayr
07b9c30354 Vox raid spawn fixes. 2013-07-13 16:23:13 -07:00
Zuhayr
7faf895563 Robots will now spawn fully equipped. 2013-07-13 04:35:50 -07:00
Zuhayr
dbe4838d40 Purging the toddler as Lord Mloc commands. 2013-07-13 04:34:09 -07:00
Zuhayr
71f36969b8 Robot health buffs, addition of armour component. 2013-07-13 04:33:48 -07:00
Mloc
1af9a7bc60 Git, I shall never understand thee. Oh well. 2013-07-12 15:20:49 +01:00
Mloc-Argent
b5c63c2a66 I have honestly no idea what happened there. Fucking git. 
This reverts commit a2fddc0fc1.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 13:31:26 +01:00
Mloc-Argent
c6a9bbc9fc Properly reverts Kida. (what a mess) 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-12 12:48:07 +01:00
Mloc-Argent
66a8536c94 Revert "Adds in the icon files for Kidan and fixes issue" 
This reverts commit 9139a70d8c.
 2013-07-12 12:22:58 +01:00
Mloc-Argent
cf53dd7a10 Revert "Adds in the Kida" 
This reverts commit a2fddc0fc1.
 2013-07-12 12:22:35 +01:00
Zuhayr
6a714f3613 Merge pull request #3300 from Spamcat/master 
meatfix revert
 2013-07-12 01:26:34 -07:00
Spamcat
c27f3efb8e Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-12 03:06:41 +04:00
Spamcat
4ceb12bb1c Revert "Quickfix for INFINIMEAT." 
This reverts commit 654a83be9d.
 2013-07-12 03:03:46 +04:00
Segrain
b5b58e5ebe Runtime error fix. 2013-07-12 00:00:59 +03:00
Segrain
f7b22fa911 Quickfix. 2013-07-11 23:14:56 +03:00
Cael_Aislinn
e4b4486768 added a spawning guide to EFTPOS devices 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-07-12 03:40:38 +10:00
Cael_Aislinn
4421bede17 moved money accounts into a global list + removed db syncing (some procs could be global but left where they are for convenience), fixed an issue with latejoiners having no account, fixed a runtime 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-07-12 03:40:06 +10:00
comma
da35278439 Merge remote-tracking branch 'remotes/origin/bleeding-edge-freeze' into viro 
Conflicts:
	html/changelog.html
 2013-07-11 02:53:58 +04:00
Chinsky
67cc13751a Derp. 2013-07-11 02:09:01 +04:00
Mloc
e820e28f78 Merge pull request #3292 from comma/master 
Fixes
 2013-07-10 14:36:32 -07:00
comma
47c6901df3 Fixes #3018 
Should stop intercept report from trying to tell that wizards, ninjas and nuke operatives are trending to be crew members ( they are not ).
 2013-07-11 01:30:16 +04:00
comma
81e22ea270 Fixes wires on air alarm not displaying cut status properly. 
Fixes #3087
 2013-07-11 00:59:44 +04:00
comma
c791208efc Made deconstruction/construction possible. Added hints ot examine since icon is same during whole process. 2013-07-11 00:18:03 +04:00
Spamcat
10b0ef11ab Fixed #3290. 
<_< you saw nothing >_>
 2013-07-10 22:58:23 +04:00
comma
45e775f5e9 Standardized proc definitions in alarm code. 2013-07-10 22:49:10 +04:00
comma
f1cfb96dab Fixes #3225. Adds separate toggle for LOOC. 
Fixes #3285. Changes way hearers are found, so it includes pAIs now.
Also adds (R) in front of LOOC messages that are sent by mobs not in view, for admins/mods, since it's quite disorienting.
 2013-07-10 22:39:27 +04:00
comma
bdaeb2c6fb Adds fire delay to all weapons (except automatics). 
For most weapons it is only slightly bigger than clicking own delay, but still can see difference between revolver and SMG.
Shotungs do not get special delay because they are slow as they are anyway.
Biggest delays go to laser cannon (40 damage per shot) and pulse rifle, ~2 seconds for one shot.
 2013-07-10 21:19:21 +04:00
Spamcat
fc294110cc Merge branch 'master' of github.com:Baystation12/Baystation12 2013-07-10 20:55:42 +04:00
Zuhayr
a8a474bca9 Changed combat module to VV only pending rebalancing. 2013-07-10 07:20:06 -07:00
comma
1a03079a66 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into viro 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-07-09 23:08:41 +04:00
Segrain
21ac3e5954 Fix for #3286. 2013-07-09 21:08:31 +03:00
Segrain
46df500cd4 Fix for #3166. 2013-07-09 19:37:17 +03:00
Segrain
a3d2a1e70f Fix for #3281. 2013-07-09 17:17:55 +03:00
fauxtada
c41abfc929 Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals! 2013-07-09 07:02:17 -07:00
comma
722d4d27fb Fixed a typo. 2013-07-09 16:07:58 +04:00
comma
e0f7097c23 Makes engineered viruses airborne too, since otherwise they are nigh useless. 2013-07-09 14:16:58 +04:00
Spamcat
aa1310a44f Fixed a potential runtime and removed buggy mobs from gold slime's spawn list as per raven's request. 2013-07-09 13:40:04 +04:00
comma
d5942c4b10 Updated HUDs to find only known viruses. 2013-07-09 13:04:05 +04:00
comma
1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
comma
ae2a9c56ad Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2013-07-09 12:48:34 +04:00
Segrain
c5a1a69b5b Stealth/invisibility tweaks. 2013-07-09 05:06:29 +03:00
Segrain
14dbcad07d HUDs and visibility. 2013-07-09 04:53:34 +03:00
Segrain
72588c8c61 MedHUDs and virus2. 2013-07-09 04:51:09 +03:00
Mloc-Argent
75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Spamcat
df90824d60 Whoa, 2 barsign.dm's? WTF? 2013-07-08 23:25:13 +04:00