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

13651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Segrain
a3d2a1e70f Fix for #3281. 2013-07-09 17:17:55 +03:00
Chinsky
c5e2f86cc3 Merge pull request #3283 from fauxki/bleeding-edge-freeze 
BEF - Map / DMI / Closet
 2013-07-09 07:17:29 -07: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
fauxtada
01d5a0f4d3 Monkey Mob DMI Changes 
- Changes Farwa sprite to the one Fox approved of before he stepped down from whitelister of tajs.
- Also re-adds in the pun pun sprite since that got removed.
 2013-07-09 07:02:01 -07:00
fauxtada
330f9176b0 Map Edits 
- Expanded Psych Office.
- Added second toolbelt to robotics.
- Fixed issue of the bar maintence door being in the kitchen cold room. Also fixed the mislabled camera. Oooops.
- Added one each of the alien baby races to genetics.
- Fixes misaligned AI door.

I'm going to have another map edit up shortly, as I want to work on some areas, but am waiting for Chinsky to finish his stuff first.
 2013-07-09 07:01:06 -07:00
Zuhayr
6dc35bb707 Merge pull request #3279 from Mloc/nudgefix 
Nudgefix
 2013-07-09 06:18:53 -07:00
Chinsky
1c3b82db16 Merge pull request #3277 from Mloc/master 
Cleaned up config files.
 2013-07-09 05:18:44 -07:00
Mloc-Argent
8fd2590362 Merge branch 'master' of github.com:Baystation12/Baystation12 into nudgefix 2013-07-09 13:10:42 +01:00
Mloc-Argent
22823d633d Quickfix for IRCbot nudge 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-09 13:10:16 +01:00
comma
722d4d27fb Fixed a typo. 2013-07-09 16:07:58 +04:00
Mloc-Argent
3f8c726815 Cleaned up config files to be more generic; main server isn't mirrored from these any more, and they are horribly out of date. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-09 12:59:14 +01:00
Chinsky
ba894beced Merge pull request #3274 from comma/bleeding-edge-freeze 
Master -> BEF
 2013-07-09 04:40:06 -07:00
comma
2509e8f836 Changelog entry. 2013-07-09 14:19:05 +04:00
comma
e0f7097c23 Makes engineered viruses airborne too, since otherwise they are nigh useless. 2013-07-09 14:16:58 +04:00
comma
74e75c71b7 Replaced viro machinery with new one. 2013-07-09 13:59:34 +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
Chinsky
9a7148bf8c Merge pull request #3271 from Segrain/master 
HUD bugfixes.
 2013-07-09 01:42:50 -07:00
Segrain
c5a1a69b5b Stealth/invisibility tweaks. 2013-07-09 05:06:29 +03:00
Segrain
965b0c419e Space ninja suit: stealth mode. 2013-07-09 04:59:02 +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
01f2c528b7 Merge pull request #3269 from Spamcat/bef 
more pulse shit
 2013-07-08 16:12:59 -07:00
Mloc-Argent
75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Mloc
b653f132a9 Merge pull request #3270 from Jamini/BEF-staging 
As per Mloc, reverting old medbay.
 2013-07-08 15:14:36 -07:00
Jamini
ec15ae67b0 As per Mloc, reverting old medbay. 
Readded some flashlight seeding.
Rejiggered engineering's layout a little
Fixed missing blast doors
Added an empty console in the monitoring room
Moved atmos consoles in the monitor room so they are all reachable.
Placed the engine and CE's office on the engine grid, not the main grid.
Tested and works, should be ready to merge.

Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-07-08 18:11:10 -04:00
Spamcat
df90824d60 Whoa, 2 barsign.dm's? WTF? 2013-07-08 23:25:13 +04: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
Zuhayr
a9c3187512 Removes combat module on green and blue alert. 2013-07-07 15:18:08 -07:00
Zuhayr
78653b3175 Removes visible tallies from votes. 2013-07-07 02:42:28 -07:00
Zuhayr
e9210b0701 Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting. 2013-07-07 02:28:34 -07:00
Chinsky
31fc09567f Merge pull request #3264 from Mloc/master 
Small fixes
 2013-07-06 14:59:13 -07:00
Mloc
e5f8a18c80 Merge pull request #3262 from Zuhayr/feature 
Replaces forcedrafting with voter drafting, removes visible tallies from votes.
 2013-07-06 14:21:19 -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
Zuhayr
6d0bc01342 Merge pull request #3261 from Jamini/BEF-staging 
Map fixes - 3247
 2013-07-06 09:08:19 -07:00
Jamini
eba84772dd Map fixes (Atmos things in walls, sideways kitchen shutters), now with maptools 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-07-06 12:02:34 -04:00
Mloc
0a638a0d08 Merge pull request #3260 from Zuhayr/feature 
Various fixes.
 2013-07-06 07:14:04 -07:00
Zuhayr
b84697055f Embedded item string fix. 2013-07-07 00:07:18 -07:00
Zuhayr
587b2d8f24 Cyborg sprite selection fix. 2013-07-07 00:00:25 -07:00
Zuhayr
ad07f5e9e5 Added procs for a custom item that were overlooked. 2013-07-06 23:53:59 -07:00
Zuhayr
ee560d43da Allowed ties to use mask sprites if equipped to the face, for accessories like lockets. 2013-07-06 23:53:24 -07:00
Zuhayr
4abd2f313b Missing tie sprites for custom item. 2013-07-06 23:42:06 -07:00
Zuhayr
9a2ce35199 Commenting out ninja mode, as it is broken. 2013-07-06 21:53:11 -07:00
Mloc
37cb049e45 Merge pull request #3259 from Segrain/master 
Science bugfixes.
 2013-07-06 06:34:36 -07:00
Segrain
82c3e6aa8c Fix for #3255. 2013-07-06 16:51:59 +03:00
Segrain
6804cf0518 Fix for #3254. 2013-07-06 16:50:01 +03:00