cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,174 Commits 8 Branches 0 Tags
f948932beec33f126adf6b0bf097af0947eb0a15
Commit Graph

19707 Commits

Author SHA1 Message Date
Kelenius
f948932bee Updates sleepers 
WIP
 2015-07-29 11:17:15 +03:00
PsiOmegaDelta
ff2b3865b8 Compilation fixes. 2015-07-27 10:41:21 +02:00
PsiOmegaDelta
5cbb703609 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/update_icons.dm
	code/modules/organs/organ.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/setup.dm
 2015-07-27 10:20:20 +02:00
PsiOmegaDelta
0838de3ba2 Compilation fixes. 2015-07-27 10:03:31 +02:00
PsiOmegaDelta
c159f4657a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/inventory.dm
 2015-07-27 09:53:08 +02:00
PsiOmegaDelta
c44f5916df Merge pull request #10323 from mwerezak/accessory-fix 
Fixes #9326
 2015-07-27 09:36:02 +02:00
Zuhayr
e0429af2f7 Added config option for initial brain organ health. 2015-07-27 15:33:54 +09:30
Zuhayr
4afa8a80f8 Readds config option to disable organ decay. 2015-07-27 15:30:38 +09:30
Kearel
f4aa2376c8 Initial fixes 
Changes interaction between stumps and items.
 2015-07-26 22:13:46 -05:00
Zuhayr
64ccd8a048 Merge pull request #10269 from Mloc/lightwrite 
lighting work
 2015-07-27 11:41:14 +09:30
Zuhayr
433b55f3df Merge pull request #10303 from PsiOmegaDelta/150726-MintingRemoval 
Removes minting.
 2015-07-27 11:40:41 +09:30
Zuhayr
1e8a7d9552 Merge pull request #10301 from PsiOmegaDelta/150726-VotingSanity 
Fixes #9894 some more.
 2015-07-27 11:40:14 +09:30
mwerezak
7157cc1748 Fixes #9326 2015-07-26 14:57:49 -04:00
SparklySheep
a5ca80656d Chops out "Security Cadet" from assistant Alt Titles. 
Will remove the other "intern" alt titles if requested but this one in particular seemed to be pretty disliked in this thread: http://baystation12.net/forums/threads/discussion-suggestion-alt-titles.237/
 2015-07-26 16:58:52 +01:00
PsiOmega
07cf41604c Removes minting. 
Fixes #10274.
 2015-07-26 11:28:16 +02:00
PsiOmega
c193e474ad Removes the mint access definitions. 
Related to #10274.
 2015-07-26 11:25:35 +02:00
PsiOmega
984d5ee337 More #10285 fixes. 
This one is dev-freeze only.  Adds another sanity check to trans_to_holder to avoid runtime issues.
 2015-07-26 10:46:58 +02:00
PsiOmega
2d24960603 Fixes #9894 some more. 
Ensures the vote sanity check is done first, before any change of vote counts.
 2015-07-26 10:45:05 +02:00
PsiOmega
bd6ec4a98e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/atoms.dm
	code/game/machinery/rechargestation.dm
 2015-07-26 10:21:36 +02:00
PsiOmega
659b07415d Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/rechargestation.dm
	code/game/mecha/equipment/tools/medical_tools.dm
 	maps/exodus-1.dmm
 2015-07-26 10:00:12 +02:00
GinjaNinja32
167b1183ef Fixes 'Fixes sealed rig removal exploit' 2015-07-26 05:47:04 +01:00
GinjaNinja32
a92dac6df4 Merge pull request #10290 from PsiOmegaDelta/150725-ColdCash 
Fixes  #10203.
 2015-07-26 05:22:49 +01:00
PsiOmega
3c1a3f6951 Fixes #10285. 
Adds Topic() input sanity checking.
 2015-07-25 14:18:10 +02:00
PsiOmega
13ca02677c Fixes #10203. 
setup_economy() was previously called twice, the removed call happened before character creation.
Moves the remaining line to ensure proper setup order.
 2015-07-25 14:08:19 +02:00
PsiOmega
835d4ddcde Fixes #10267. 
Laws are always pre-sanitized.
 2015-07-25 13:30:25 +02:00
Chinsky
cc75e8d220 Merge pull request #10271 from mwerezak/recharging-station 
Fixes #10003
 2015-07-25 05:33:21 +03:00
Snapshot
a13467d8a4 Merge pull request #10286 from comma/tor 
Updates ToR list URL
 2015-07-24 17:31:15 -07:00
Chinsky
0753429740 Updates ToR list URL 2015-07-25 03:27:46 +03:00
Zuhayr
1851ec58cd Merge pull request #10277 from GinjaNinja32/changelingtypo 
Fixes typo in changeling absorbing
 2015-07-25 00:23:37 +09:30
PsiOmegaDelta
74872e28a7 Compilation fix. 2015-07-24 11:02:39 +02:00
PsiOmegaDelta
f3c9a7224b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/reagents/reagent_containers/borghydro.dm
 2015-07-24 10:53:57 +02:00
PsiOmegaDelta
9b0497e01e Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-24 10:46:32 +02:00
GinjaNinja32
006ed3ec53 Fixes typo in changeling absorbing 2015-07-24 02:35:49 +01:00
Chinsky
90ae24dd1c Merge pull request #10135 from Kelenius/ofBorgsAndShakers 
Of borgs and shakers
 2015-07-23 21:41:48 +03:00
Chinsky
390bf93d4d Merge pull request #10261 from PsiOmegaDelta/150722-LawNumbering 
Fixes #10254.
 2015-07-23 21:01:33 +03:00
PsiOmegaDelta
aec2ed05dc Merge pull request #10247 from Kelenius/ofJanicartAndLabels 
Of janicart and labels
 2015-07-23 09:47:15 +02:00
PsiOmegaDelta
83289c1b78 Merge pull request #10273 from Kelenius/ofRobotsAndBoxes 
Of robots and boxes
 2015-07-23 09:15:46 +02:00
Kelenius
7efaab0ab4 Fixes #9540 - borg message when using DA on storage 
Radically. Frankly, this message is useless.
 2015-07-23 10:10:10 +03:00
PsiOmegaDelta
39a1b3e4ab Merge pull request #10272 from Baystation12/dev-freeze 
Dev freeze -> Dev
 2015-07-23 08:14:39 +02:00
mwerezak
8b81dadfc5 More cleanup 
Removes dynamic member lookup in rechargestation.dm. Removes unused proc allow_drop().
 2015-07-23 01:56:39 -04:00
mwerezak
f0bfd03898 Updates recharge station desc when parts are refreshed 2015-07-23 00:07:28 -04:00
mwerezak
d353f30fc1 Fixes #10003 
Fixes numerous issues with cyborg recharging stations, such as incorrect
power use, runtimes when cyborgs exit the station, and odd things like
if(NOPOWER|BROKEN).
 2015-07-23 00:06:39 -04:00
Chinsky
135df023d3 Merge pull request #10265 from Kelenius/ofBeakersAndMicrowaves 
Of beakers and microwaves
 2015-07-22 20:31:45 +03:00
Mloc
26a4e12cd2 make lighting falloff a macro and optimize turfs-in-view 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-22 16:22:28 +01:00
Mloc
65ac3d97d0 Revert "get rid of mob.see_in_dark and species.darksight" 
This reverts commit 278a4c38ec.
 2015-07-22 15:14:40 +01:00
Mloc
30f448cdd2 Merge pull request #10253 from PJB3005/bay-lights 
Lighting: The sanicking
 2015-07-22 14:55:49 +01:00
Kelenius
b83afb10f8 Moves supply pack check down to atom 2015-07-22 13:05:26 +03:00
Kelenius
76fb9ca357 Fixes #9550 - beakers hit microwaves 2015-07-22 12:40:16 +03:00
Kelenius
b637030c21 Fixes #9209 - cargo manifests don't show contents 
This is a correct way of using initial() with a prototype that doesn't
create a new object
 2015-07-22 10:35:22 +03:00
PsiOmegaDelta
ec3faf35e8 Fixes #10254. 
Nothing to see here.
 2015-07-22 08:11:52 +02:00