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,808 Commits 5 Branches 0 Tags
b4371916dec8cd6f1bcc41532b9f294c2ccf743a
Commit Graph

16354 Commits

Author SHA1 Message Date
Zuhayr
b4371916de Replaced some magic numbers. 2014-12-28 17:33:09 +10:30
Zuhayr
fabee2fdf8 Stopped glass shards from proning mobs with NO_PAIN. 2014-12-28 17:32:55 +10:30
Zuhayr
8d7b68d1f5 Fixes double space issue with pain emotes. 2014-12-28 17:19:30 +10:30
Ccomp5950
5e7b95ad14 Merge pull request #7543 from Zuhayr/xenofixes 
Xeno fixes.
 2014-12-27 22:03:38 -05:00
Zuhayr
a7f47e32d7 Merge pull request #7534 from mwerezak/doors 
Doors and stacks
 2014-12-28 13:14:23 +10:30
Zuhayr
85fe8b293b Merge pull request #7544 from Zuhayr/dev-freeze 
Several fixes.
 2014-12-28 13:10:02 +10:30
Ravensdale
358e6c0d70 Wording tweak1 2014-12-27 14:23:59 -08:00
Ravensdale
1e90bf460c Fixes a comment, bleh. 2014-12-27 10:57:13 -08:00
Ravensdale
da6a6961ce Corrected oversight 2014-12-27 10:45:55 -08:00
Ravensdale
93db93cd51 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into essEssDee 2014-12-27 10:26:24 -08:00
Ravensdale
393593046e Overhauls SSD mechanic. 2014-12-27 09:16:50 -08:00
Zuhayr
931682f926 Fixes #7327 2014-12-27 10:01:17 +10:30
Zuhayr
011b9a6c1f Amending stun commit. 
Stun will properly be set to 0 if the species has NO_PAIN.
 2014-12-27 09:20:12 +10:30
PsiOmegaDelta
3e333ee1dc Merge pull request #7541 from GinjaNinja32/posilang 
Fix brain/posibrain languages
 2014-12-27 11:29:56 +13:00
Zuhayr
36d5525437 Extremely minor runtime fix. 2014-12-27 08:45:30 +10:30
Zuhayr
49ca5ee0ca NO_PAIN will now properly stop hard stun from taking effect. 2014-12-27 08:29:58 +10:30
mwerezak
7c65de3e34 Improves power monitor UI 
Improves power monitor sensor list UI. Fixes #7449
 2014-12-26 16:55:03 -05:00
Zuhayr
8acb3b6402 Typo from robotslash commit. 2014-12-27 08:19:16 +10:30
Zuhayr
4a9a6636a0 Fixed incorrect cuff resist time when species with can_shred() resisted. 2014-12-27 08:11:35 +10:30
Zuhayr
e3cec50583 Fixed incorrect role check on leap(). 2014-12-27 08:11:18 +10:30
Zuhayr
b073c03708 Added xenomorph exclusions to space suits and helmets. 2014-12-27 08:10:55 +10:30
Zuhayr
86cd10057d Fixed brain transplant issue. 2014-12-27 08:10:21 +10:30
Zuhayr
0511ea9567 Added proc for can_shred() on robots. 2014-12-27 08:10:05 +10:30
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
mwerezak
07debf9405 Adjusts door repair to use a welding tool 2014-12-25 15:31:15 -05:00
mwerezak
f297f7cd0a Stack reorganization, use() now dels after yield 
stack/use() now only deletes an empty stack after the current context
yields, removing the need for some awkward patterns when dealing with
stacks. Also adds procs for transferring and splitting stacks.
 2014-12-25 15:09:09 -05:00
mwerezak
64e26b2dbd Fixes robot stacks transferability 
Cleans up transferring between stacks and makes robot stacks
transferable with regular ones.
 2014-12-25 15:06:31 -05: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