cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,651 Commits 5 Branches 0 Tags
fe0e1ecfb65efbdd1069affe77a73c048a39f02c
Commit Graph

5784 Commits

Author SHA1 Message Date
Segrain
fe0e1ecfb6 Conflict fix? 2013-07-25 09:55:35 +03:00
Segrain
cf4f9ba054 Typo fix, retractor step bugfix. 2013-07-25 03:06:06 +03:00
Kilakk
52ac0fdf31 Added crew manfiest verb for ghosts. 
Made the silicon crew manfiest monochrome, because why not?
 2013-07-23 19:11:30 -04:00
Mloc-Argent
09db9f1ff0 Nerfed snoring frequency. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-23 23:38:49 +01:00
Mloc-Argent
e7f38be3b4 Beakers and other glass containers now hide their contents, only showing the amount. 
Additionally, they can be labeled with a pen, up to a max of 10 characters.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:38:34 +01:00
Mloc-Argent
8421cd44df Upped the capacity of Eleanor Stone/RKF's custom teapot item to 150 units, by request. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:37:39 +01:00
Mloc-Argent
bdaabaec46 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2013-07-22 14:42:50 +01:00
Chinsky
a344010db4 Merge pull request #3330 from Kilakk/master 
Compile fix (read: I'm an idiot)
 2013-07-21 18:50:12 -07:00
Kilakk
d369b9ffff Compile fix (read: I'm an idiot) 2013-07-21 19:49:30 -04:00
Chinsky
f9b6ef3593 Merge pull request #3328 from Mloc/master 
Bugfixes.
 2013-07-21 16:42:29 -07:00
Kilakk
e9483415d3 Fixes #3326 - uncommented admin-ERT verb 2013-07-21 19:38:32 -04:00
Mloc-Argent
f0e0951c1c Fixes #3230. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 00:18:24 +01:00
Mloc-Argent
e4b67a3466 Fixes #3104. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-21 16:55:30 +01:00
Mloc-Argent
adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:38:00 +01:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01: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
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
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
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
Mloc
e820e28f78 Merge pull request #3292 from comma/master 
Fixes
 2013-07-10 14:36:32 -07:00
Spamcat
10b0ef11ab Fixed #3290. 
<_< you saw nothing >_>
 2013-07-10 22:58:23 +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
Segrain
21ac3e5954 Fix for #3286. 2013-07-09 21:08:31 +03:00
Segrain
a3d2a1e70f Fix for #3281. 2013-07-09 17:17:55 +03: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
c8eb9df6ac How do I grammar? 2013-07-08 22:56:35 +04:00
Spamcat
0e153b7226 Updated pulse checking on examine, optimized handle_pulse(), fixed some grammer. 
xoxo chinsky
 2013-07-08 22:37:54 +04:00
Chinsky
31fc09567f Merge pull request #3264 from Mloc/master 
Small fixes
 2013-07-06 14:59:13 -07:00
Mloc-Argent
3ce4e2ad17 Fixes #2559 
Changes Add-Note and Notes verb to be under the IC category, instead of OOC.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-06 22:20:13 +01:00
Mloc-Argent
94af89d0a2 Fixes #2091 
Adds missing topic() code for page selection on player notes, properly alphabeticalizes.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-06 22:16:01 +01:00