cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,784 Commits 5 Branches 0 Tags
534befe753a1ee36845a27b2f05eef1d0fe1f696
Commit Graph

16334 Commits

Author SHA1 Message Date
Hubblenaut
534befe753 Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze 
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/human/unarmed_attack.dm
 2014-12-28 00:04:53 +01:00
Hubblenaut
88b967f58c Fixes merge conflict, uses force 2014-12-27 22:51:27 +01:00
PsiOmegaDelta
3e333ee1dc Merge pull request #7541 from GinjaNinja32/posilang 
Fix brain/posibrain languages
 2014-12-27 11:29:56 +13:00
mwerezak
7c65de3e34 Improves power monitor UI 
Improves power monitor sensor list UI. Fixes #7449
 2014-12-26 16:55:03 -05:00
GinjaNinja32
ccaf9a4edf Change fleshbrains in MMIs to not be able to use :b 2014-12-26 14:18:01 +00:00
GinjaNinja32
ccece63d0b Fix brain languages 2014-12-26 11:26:07 +00:00
Zuhayr
8978747e53 Moved several globals into the config controller, updated eample config appropriately. 2014-12-25 21:10:30 +10:30
Zuhayr
844c795c7a Removed unused log var (diaryofmeanpeople). 2014-12-25 20:28:03 +10:30
Zuhayr
3997129390 Tidies up setup.dm, moves a bunch of vars to global.dm, changes the case of a couple. 2014-12-25 20:26:22 +10:30
Zuhayr
930e8c6e5d Removes an unused debug var. 2014-12-25 20:09:45 +10:30
Zuhayr
f4ada7b869 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-25 20:05:01 +10:30
Atlantiscze
4ba6e20b04 Fixes shutters texture when damaged 
- Damaged shutters no longer transform into blast doors.
- Fixes #7443
 2014-12-25 01:37:21 +01:00
SkyMarshal
fee93bba38 Fix bloody extinguisher bug. 2014-12-24 16:24:16 -07:00
PsiOmegaDelta
3427787359 Merge pull request #7524 from Zuhayr/mutantrace 
Species and organ fixes.
 2014-12-25 10:56:17 +13:00
Zuhayr
31ba0d12e0 Fixes #6676 and #7375 2014-12-24 23:32:10 +10:30
Zuhayr
0263bc9c84 merge 2014-12-24 22:50:13 +10:30
Zuhayr
c49cb0c645 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2014-12-24 22:43:10 +10:30
Zuhayr
aeb93d8c4a Fixes #7108 2014-12-24 22:43:00 +10:30
Zuhayr
c6245681d6 Fixes #5910 2014-12-24 22:23:26 +10:30
Zuhayr
e74c0c38e4 Fixes #5801 2014-12-24 22:00:31 +10:30
PsiOmegaDelta
aa3aa472fe Merge pull request #7516 from mwerezak/pipecleaner 
Replaces connect type system
 2014-12-24 19:50:36 +13:00
PsiOmegaDelta
f580eb230e Merge pull request #7521 from mwerezak/master 
Fixes being able to put lit welders in backpacks
 2014-12-24 19:49:53 +13:00
mwerezak
d36f465647 Fixes being able to put lit welders in backpacks 2014-12-24 00:55:56 -05:00
Zuhayr
4b030f30cd Refactors and fixes a fair bit of organ transplanting/reattachment/gibbing code. Also fixes an issue with species HUDs. 2014-12-24 16:06:00 +10:30
PsiOmegaDelta
d1758a7162 Merge pull request #7510 from Zuhayr/mutantrace 
Gibber fixes/refactor, mutantrace refactor, couple of small fixes.
 2014-12-24 17:29:39 +13:00
Zuhayr
01f2d28187 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into mutantrace 2014-12-24 12:47:56 +10:30
Zuhayr
a82ec718f3 Fixes #7508 2014-12-24 12:43:36 +10:30
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
Zuhayr
2ed0e433aa Table/rack refactor. Fixes #7509 2014-12-24 12:14:48 +10:30
mwerezak
d4a193808b Replaces awful connect type system with bitflags 2014-12-23 18:59:54 -05:00
Zuhayr
5d6e805206 Why in the dicks is slime code so HORRIBLE. Removes a very redundant piece of code in obj/item/attack() dealing with slimes. 2014-12-24 04:19:56 +10:30
Hubblenaut
7988b78f69 No stomping when grabbing 2014-12-23 14:46:59 +01:00
Hubblenaut
d2a31eb024 Changes on kicks and stomps 2014-12-23 14:46:58 +01:00
Zuhayr
cc00fa3d52 Fixes and tweaks to the previous. 2014-12-23 22:03:02 +10:30
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
Zuhayr
b9f9337584 Fixes atmos alert consoles for #5460 2014-12-23 14:00:02 +10:30
Zuhayr
7c2407c21c Fixes #5220 2014-12-23 13:23:35 +10:30
ccomp5950
0a63932d48 Simple Animals now no longer move while facing south all the time. 
Fucking weirdo's

resolves #7396 for simple animals.
 2014-12-22 21:44:48 -05:00
ccomp5950
66ac2d6e05 Added "give them their breath back" to admin_revive. 
Prevents perpetual oxyloss after a revive.
 2014-12-22 21:44:38 -05:00
ccomp5950
3ba1b18b8f Most PDA's now are set to silent on news updates. 
resolves #7454

Heads and Librarian(reporter) are not set to silent.  The librarian can shush herself.
old bitty.
 2014-12-22 21:44:26 -05:00
ccomp5950
b446ccb2ab Remove Borg nightvision when special views aren't selected. 
Resolves #7452
 2014-12-22 21:44:11 -05:00
Zuhayr
056d2c1584 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 12:56:42 +10:30
Zuhayr
83c17750c7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 12:56:17 +10:30
Mloc
984444d11d Merge pull request #7498 from Zuhayr/dev-freeze 
Should fix #6782
 2014-12-22 19:04:15 +00:00
PsiOmegaDelta
5b03184e9c Merge pull request #7491 from Mloc/bs12-sleepyedges 
atmos changes; sleepy edges and hardy rwalls
 2014-12-22 20:04:08 +01:00
Mloc-Argent
8800c33e50 fixes #7487 
also fixes lag when building APCs in space.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-12-22 15:41:07 +00:00
Amunak
15b4c1f5fe Fixes shield circuit board research designs 2014-12-22 15:25:34 +01:00
Zuhayr
e6110b61b6 Should fix #6782 2014-12-23 00:50:11 +10:30
Zuhayr
360775b96f Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 00:01:09 +10:30
Zuhayr
f55f9c7fce Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2014-12-23 00:00:48 +10:30