cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 20:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,229 Commits 6 Branches 0 Tags
00fa623c9d9119245998b51bc8d1cc8d7390aea4
Commit Graph

20433 Commits

Author SHA1 Message Date
PsiOmegaDelta
9e46dfbb56 Re-arranges data record and crew arrival announcement code. 2015-07-28 11:27:44 +02:00
Atlantis
e10a1f3e01 Mercenaries/Raiders should now have proper headset again 
- This should fix #10313
 2015-07-28 10:48:22 +02:00
PsiOmega
385a21772d Adds anti-photon grenades. 2015-07-28 09:25:38 +02:00
PsiOmegaDelta
e1aa05be02 Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates 
Conflicts:
	code/game/machinery/computer/security.dm
 2015-07-28 09:16:34 +02:00
PsiOmegaDelta
2387b88507 Compilation fixes. 2015-07-28 09:06:08 +02:00
PsiOmegaDelta
0ab507ccec Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-07-28 09:03:49 +02:00
PsiOmegaDelta
c0d23536e2 Merge pull request #10338 from PsiOmegaDelta/dev-freeze 
Master -> Dev-freeze
 2015-07-28 08:55:01 +02:00
PsiOmegaDelta
0bf3c39095 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-07-28 07:59:49 +02:00
Mloc
aab326e05f fixes #10232 
makes lights trigger on forceMove using a vg change

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-27 11:40:37 +01:00
GinjaNinja32
40693fda5b Merge pull request #10335 from PsiOmegaDelta/150727-SpawnLog 
Adds admin message log to the spawn verb.
 2015-07-27 10:54:40 +01:00
Mloc
1d8e015334 fixes #10141 
also clean up alloy_data handling

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-27 10:49:51 +01:00
PsiOmegaDelta
81c40c14b1 Compacts down the game panel spawn logging and makes it always notify admins. 2015-07-27 11:47:55 +02:00
PsiOmegaDelta
631c30732d Adds admin message log to the spawn verb. 
The spawn-verb no longer only makes an entry in the admin log but also messages admins, making it less sneaky.
 2015-07-27 11:24:44 +02:00
Mloc
65ad30f27c Merge pull request #10305 from GinjaNinja32/player-panel 
Changes player panel to always display key if present
 2015-07-27 10:20:11 +01:00
Mloc
2046bd1cec Merge pull request #10330 from mwerezak/fire 
Fixes oversight in fire burnout check
 2015-07-27 10:19:50 +01:00
PsiOmegaDelta
ff2b3865b8 Compilation fixes. 2015-07-27 10:41:21 +02:00
Zuhayr
c5c7dddf63 Merge pull request #9979 from mwerezak/camera-console-fix 
More check_eye() fixes
 2015-07-27 17:56:03 +09:30
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
Neerti
f445d6d126 Moves the energy chemical dispenser and cartridge chemical dispenser under one common object. Fixes the map due to type path changes. 2015-07-26 23:20:42 -04:00
Kearel
f4aa2376c8 Initial fixes 
Changes interaction between stumps and items.
 2015-07-26 22:13:46 -05:00
mwerezak
e8db7dc8d8 Fire now uses the full zone size when considering the minimum amount of phoron/oxygen required to sustain a fire 
Fixes an oversight that made fires able to burn with a smaller amount of phoron than they should.
 2015-07-26 22:47:18 -04:00
Neerti
7a22829ee9 Revert "Replaces gaseous reagents with organic chemistry ones." 
This reverts commit aa22f7307a.

Conflicts:
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/Chemistry-Recipes.dm
 2015-07-26 22:43:40 -04: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
Neerti
045c7323a0 Begins work on removing the chemistry changed introduced from bay. 2015-07-26 22:01:35 -04:00
Kearel
ecaf43440b Paperbin 
Adds ability to pick up paperbin by dragging it on the player.
 2015-07-26 18:58:29 -05:00
Neerti
94a2ec5bf1 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 7/26/2015_bay_merge_2 
Conflicts:
	.travis.yml
	polaris.dme
 2015-07-26 16:01:27 -04:00
Mloc
fe4490a295 fixes #10316 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-26 20:53:13 +01:00
Kearel
7c6cd7b1e7 Further modifications 2015-07-26 13:58:53 -05:00
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
GinjaNinja32
0e71efea18 Changes player planel to always display key if present 2015-07-26 11:03:36 +01:00
GinjaNinja32
7eb1e547a3 Better follow code 2015-07-26 10:45:45 +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