cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,518 Commits 6 Branches 0 Tags
c63f4c62b51507e2de577863478638b6b21a41f2
Commit Graph

26518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PsiOmegaDelta
c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney 
Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm
 2015-08-13 08:06:11 +02:00
Chinsky
ac80136603 Merge pull request #10184 from mwerezak/projectile-cleanup 
Projectile code cleanup
 2015-08-13 07:26:58 +03:00
Chinsky
6781e05bd6 Merge pull request #10086 from mwerezak/arrows 
Adds the ability to draw arrows with crayon
 2015-08-13 07:24:03 +03:00
Chinsky
f7ccf47f06 Merge pull request #10030 from GinjaNinja32/languages 
Reworks character creation language selection
 2015-08-13 07:23:44 +03:00
Chinsky
89659c99fc Merge pull request #10001 from PsiOmegaDelta/150702-MaskRefactor 
Refactors mask voice changes.
 2015-08-13 07:23:27 +03:00
Chinsky
562eba574d Merge pull request #10000 from Kearel/voxSprites 
Vox sprites to dev version
 2015-08-13 07:23:17 +03:00
Chinsky
3fd8627bd7 Merge pull request #9996 from PsiOmegaDelta/150702-AtmosAnalyzeCleanup 
Refactors gas analyzation.
 2015-08-13 07:23:10 +03:00
Chinsky
81932abb29 Merge pull request #9995 from PsiOmegaDelta/150630-AddingThatMissing24GHour0ItIsDrivingMeInsaneAlright 
Time padding.
 2015-08-13 07:23:05 +03:00
Chinsky
2b965d7cd7 Merge pull request #9907 from Zuhayr/windowspawner 
Ported window spawner, tyvm WrongEnd
 2015-08-13 07:22:58 +03:00
Chinsky
fc14ec9fca Merge pull request #9883 from mwerezak/ert-lights 
Adds more coloured lights
 2015-08-13 07:22:45 +03:00
Chinsky
ee387d8fb6 Merge pull request #10171 from orelbon/7-13-15_HoP_suit_edit 
HoP Suit resprite
 2015-08-13 07:22:36 +03:00
Chinsky
21f7c8234d Merge pull request #10473 from mwerezak/firemode-cleanup 
Streamlines gun fire modes
 2015-08-13 07:22:28 +03:00
PsiOmegaDelta
c937cba330 Merge pull request #10575 from PsiOmegaDelta/dev 
Dev
 2015-08-12 21:33:52 +02:00
PsiOmega
ba240cb768 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
 2015-08-12 21:18:18 +02:00
PsiOmegaDelta
ad240caf13 Merge pull request #10574 from PsiOmegaDelta/dev-freeze 
Dev freeze
 2015-08-12 21:11:55 +02:00
GinjaNinja32
cb5e412613 Merge pull request #10573 from PsiOmegaDelta/150812-QMDoorButton 
Fixes QM office door access requirements.
 2015-08-12 20:07:26 +01:00
PsiOmega
c5d624eb93 Fixes QM office door access requirements. 
Now checks for quartermaster access, instead of captain. Fixes  #10565.
Also gives the QM the ability to see all the doors his buttons can open.
 2015-08-12 21:04:07 +02:00
mwerezak
5b6c5ee5ce Merge pull request #10570 from Zuhayr/master 
Couple of fixes.
 2015-08-12 15:00:36 -04:00
Zuhayr
5f17cf4397 Merge pull request #10568 from SparklySheep/patch-14 
Fixes #10532
 2015-08-13 04:18:23 +09:30
Zuhayr
64a89fc5e4 Removes seed colour from nymphs. 2015-08-13 03:33:28 +09:30
Zuhayr
9831aede3f Fixes drone pulling. 2015-08-13 03:31:57 +09:30
PsiOmegaDelta
94e3fe6f5f Merge pull request #10567 from mwerezak/fire-cooling-fix 
Fixes carbon fire_act()
 2015-08-12 19:54:42 +02:00
Chinsky
8c8c2bce85 Merge pull request #10503 from PsiOmegaDelta/150811-BorgSpawnRuntime 
Fixes a borg spawn runtime.
 2015-08-12 20:42:04 +03:00
Chinsky
0e52b3d4df Merge pull request #10562 from PsiOmegaDelta/150812-OneCrew 
Fixes the One Crew Member module.
 2015-08-12 20:38:52 +03:00
Chinsky
069de7dcb6 Merge pull request #10560 from PsiOmegaDelta/150812-CorrectTypeCheck 
Prevents APC wires from being displayed to the AI.
 2015-08-12 20:38:34 +03:00
Chinsky
e562affd13 Merge pull request #10551 from PsiOmegaDelta/150812-RuntimeFixes 
Runtime fixes.
 2015-08-12 20:38:20 +03:00
Chinsky
c9de7ddd43 Merge pull request #10566 from mwerezak/runtime-fixes 
Runtime fixes
 2015-08-12 20:36:49 +03:00
SparklySheep
27296e7caf Update preferences_gear.dm 2015-08-12 12:13:28 -05:00
SparklySheep
cefd32fa69 Update glasses.dm 2015-08-12 12:09:00 -05:00
HarpyEagle
a62edc5b3a Fixes #10548 2015-08-12 12:21:28 -04:00
HarpyEagle
9609ce0b0d Fixes #10546 2015-08-12 12:06:31 -04:00
HarpyEagle
1e8e0547e4 Fixes carbon fire_act() 
Caused fire to actually cool down the mob if the mob was already hotter
than the exposed temperature.
 2015-08-12 11:58:11 -04:00
Zuhayr
4db1a553f2 Merge pull request #10556 from PsiOmegaDelta/150812-Stripping 
Adds sanity checks for stripping.
 2015-08-13 00:39:41 +09:30
mwerezak
565ccc2baa Merge pull request #10545 from PsiOmegaDelta/150812-QdelFix 
Qdels the photo dummy.
 2015-08-12 10:29:41 -04:00
mwerezak
db71f6a03d Merge pull request #10541 from PsiOmegaDelta/150812-BotCheck 
Re-adds missing bot check.
 2015-08-12 10:28:45 -04:00
mwerezak
8da78d09e9 Merge pull request #10542 from PsiOmegaDelta/150812-HoloStools 
Holodeck stool icon fix.
 2015-08-12 10:28:12 -04:00
mwerezak
f24c1f052e Merge pull request #10544 from PsiOmegaDelta/150812-StatRuntime 
Fixes various stat runtimes
 2015-08-12 10:27:55 -04:00
PsiOmegaDelta
249db0b03d Fixes the One Crew Member module. 
Didn't return properly in install().
Override transmitInstructions() when addAdditionalLaws() was more than sufficient.
 2015-08-12 14:42:52 +02:00
PsiOmegaDelta
1b7b69306c Prevents APC wires from being displayed to the AI. 
Restores and makes the mob type check more specific. Fixes #10559.
 2015-08-12 13:34:12 +02:00
PsiOmegaDelta
67c79e7a1b Adds sanity checks for stripping. 
Mobs can no longer strip other mobs while prone, unconscious, or buckled down. Fixes #10553.
 2015-08-12 13:12:52 +02:00
PsiOmegaDelta
3e4ec4d7b7 NanoUI windows now close on Destroy(), preventing all sorts of qdel issues. 2015-08-12 09:41:22 +02:00
PsiOmegaDelta
93e666e67c Adds a missing not-null check that is made in another case. 2015-08-12 09:22:46 +02:00
PsiOmegaDelta
3bba0f95b1 Qdels the photo dummy. 2015-08-12 09:14:36 +02:00
PsiOmegaDelta
48d5e73729 Fixes an observer runtime. 2015-08-12 09:10:16 +02:00
PsiOmegaDelta
7031ff0b43 Fixes human spawn runtime. 
Similar to #10503.
 2015-08-12 09:07:48 +02:00
PsiOmegaDelta
3cb6b1ca79 Holodeck stool icon fix. 
Backports the icon state change from dev. Fixes #10515.
 2015-08-12 08:33:57 +02:00
PsiOmegaDelta
32338716bf Re-adds missing bot check. 
Not all bots are of the type /mob/living/bot yet. Re-adds the /obj/machinery/bot-type check on airlock bump.
Fixes #10507.
 2015-08-12 08:28:39 +02:00
PsiOmega
da6a3e98d8 Fixes a borg spawn runtime. 
Adds client check to prevent null.statpanel runtime.
 2015-08-12 08:04:11 +02:00
GinjaNinja32
8915edcce2 Merge pull request #10537 from mwerezak/mapping-fixes 
Fixes and mapping
 2015-08-12 06:39:30 +01:00
mwerezak
341e6c22ff Merge pull request #10538 from GinjaNinja32/debug 
Debug code to try to figure out the cause of the player-panel etc breaking
 2015-08-12 01:21:29 -04:00