cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-17 13:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 9 Branches 0 Tags
69a080e2d611c6d45cb157861cade41f05d23721
Commit Graph

17479 Commits

Author SHA1 Message Date
Zuhayr
f43f58380c Fixes #7703 2015-01-09 08:26:53 +10:30
Zuhayr
683c8b50a8 Fixes #7702 2015-01-09 08:09:46 +10:30
Tramziller
11ff174636 Old link was replaced by new one 2015-01-08 22:26:31 +01:00
Zuhayr
7c88b54404 Fixes #7722 2015-01-09 07:30:48 +10:30
Zuhayr
a4fca84e3e Fixes #7726 2015-01-09 06:44:09 +10:30
Zuhayr
a01592d5b7 Fixes #7740 2015-01-09 06:25:27 +10:30
Amunak
7891c8c21b Merge pull request #1 from Tramziller/dev 
Added print button into RD consoles
 2015-01-08 19:08:58 +01:00
Tramziller
aa3c7574ca Added option to print research levels and researched devices to RD consoles 2015-01-08 19:03:05 +01:00
Zuhayr
7e0610e31c Fixes #7684 2015-01-09 04:18:42 +10:30
Zuhayr
8d2d3302bd Fixes #7720 2015-01-09 04:07:08 +10:30
Zuhayr
c3756e3a03 Fixes #7701 2015-01-09 04:05:11 +10:30
Zuhayr
b36b41a2f5 Fixes #7656 2015-01-09 03:58:43 +10:30
Zuhayr
29435d8750 Fixes #7700 2015-01-09 03:56:12 +10:30
Zuhayr
cd53ed613c Fixes #7691 2015-01-09 03:51:47 +10:30
Zuhayr
0d071e7f9d Fixes #7683 2015-01-09 03:48:46 +10:30
mwerezak
08cda65973 Adjusts major event weightings 2015-01-08 00:00:57 -05:00
mwerezak
c3413bc7d7 Fixes meteor event 2015-01-07 23:29:52 -05:00
Zuhayr
0d56551319 Merge pull request #7729 from Baystation12/dev-freeze 
Dev freeze
 2015-01-07 18:15:03 +10:30
Tramziller
29a0ae2ad6 Response to #7686 2015-01-06 21:48:56 +01:00
Zuhayr
07298fa31a Merge pull request #7697 from Tramziller/dev-freeze 
Shot airlock fix
 2015-01-07 06:02:06 +10:30
Zuhayr
ab711b5080 Merge pull request #7695 from Amunak/patch-1 
Makes LOOC dark turquoise, fixes #7681
 2015-01-07 04:33:56 +10:30
ccomp5950
27765f799f Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflict resolution.

Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
 2015-01-06 12:36:28 -05:00
Zuhayr
cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
Mloc
7570cf7ea7 Merge pull request #7708 from comma/master 
Fixes #7707
 2015-01-06 15:28:32 +00:00
Chinsky
38c69bab64 Fixes #7707 2015-01-06 13:14:20 +03:00
Zuhayr
66759eff3c Adds Borer bantype, halves borer resist time, comments out Devour Brain verb, expands borer welcome text. 2015-01-06 11:11:34 +10:30
Tramziller
06e6277dc6 Fixed bug of peridaxon healing robotic organs 2015-01-05 22:17:40 +01:00
Tramziller
be48eccad2 Airlock that are BROKEN (shot or like) can have their electronics removed (for repairs) even when their bolts are dropped 2015-01-05 20:39:00 +01:00
Amunak
c34a8ee859 Admin name colour msay colour fix 
Admin name colour in msay now matches their default OOC colour. Hopefully fixes some concerns presented in #7657.
 2015-01-05 18:40:52 +01:00
Zuhayr
822f48eab6 Added black and white sports bra to underwear options. 2015-01-06 02:03:40 +10:30
Zuhayr
e07a14c0ea Made bomber jacket/hoodies toggleable, added black hoodie. 2015-01-06 01:35:45 +10:30
Amunak
e5512518bb Makes LOOC dark turquoise, fixes #7681 2015-01-05 13:48:22 +01:00
mkalash
559e224446 Allows the autolathe maintenance panel to be accessed even if disabled. Fixes #7677. Adds feedback when a someone tries to interact with a disabled autolathe with the panel closed. 2015-01-04 22:43:20 -05:00
mkalash
f9e352b768 Gets rid of the white wire in Omega's new wire system. The background of the UI is white, so you can't read the wire's name. I replace it with dark red. 2015-01-04 22:26:41 -05:00
mkalash
536e4bd237 Adds missing paranthesis in logic for airlock's hasPower(). Fixes #7653 2015-01-04 22:09:00 -05:00
mkalash
6e8d2c55b0 Adds stack amount check when loading materials into the exosuit fabricator. Fixes #7665 2015-01-04 21:34:50 -05:00
PsiOmegaDelta
d1d88fa365 Merge pull request #7687 from Tramziller/Girder_fix 
Fixes bug where girders can be destroyed with stun beams.
 2015-01-04 23:50:36 +01:00
Mloc
ec9b46399b Merge pull request #7673 from SkyMarshal/patch-3 
Fixes runtime with deleted cameras.
 2015-01-04 21:06:42 +00:00
SkyMarshal
863351a474 Changes the runtime protection to be more general-case. 2015-01-04 13:32:11 -07:00
Tramziller
fb86581159 Fixes bug where girders can be destroyed with stun beams. 2015-01-04 21:12:32 +01:00
SparklySheep
0de42a1419 Adds the visitor alt-title. 
http://www.baystation12.net/forums/viewtopic.php?f=5&t=11868
 2015-01-04 13:27:15 -06:00
Zuhayr
9fa73784a5 Fixes #7660 2015-01-05 01:05:13 +10:30
Zuhayr
f7cd72b7f9 Fixes #7670 2015-01-04 19:06:45 +10:30
Zuhayr
81603032d3 Fixes #7671 2015-01-04 19:05:55 +10:30
SkyMarshal
65163dfcc5 Fixes runtime with deleted cameras. 2015-01-04 01:22:37 -07:00
PsiOmegaDelta
fedc8eab16 Merge pull request #7651 from Kelenius/ofFloorbotsAndFootprints 
Of floorbots and footprints
 2015-01-04 08:57:02 +01:00
mkalash
6d9c2671b9 Copies extinguisher code to exosuit extinguisher, fixes #7603 2015-01-04 00:43:19 -05:00
Atlantiscze
5f921676d8 ZAS Emergency fix 
- Fixes massive losses of heat during ZAS operation.
 2015-01-04 02:16:07 +01:00
Ccomp5950
c78ad9666a Merge pull request #7649 from Kelenius/ofDionaeAndDrugs 
Fixes a tiny typo and a comment
 2015-01-03 17:43:32 -05:00
Ccomp5950
ba6562026a Merge pull request #7648 from Kelenius/ofMonkeysAndVents 
Restores monkey's ability to ventcrawl
 2015-01-03 17:41:44 -05:00