cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,993 Commits 10 Branches 0 Tags
19fbc712498f1a51a7f74d28237d818c92f89e36
Commit Graph

11823 Commits

Author SHA1 Message Date
HarpyEagle
19fbc71249 Removes req_amount from stack_recipe_list 
The stack_recipe_list datum itself is not used to make anything, so having
a req_amount made little sense. Fixes #10572.
 2015-08-12 15:54:16 -04:00
HarpyEagle
3e6889927e Fixes #10500 2015-08-12 15:26:57 -04:00
HarpyEagle
a43f77b070 Gives hydro soil recipe a better name 
Gives the hydro soil recipe a name that better conveys it's purpose.
 2015-08-12 15:25:01 -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
8da78d09e9 Merge pull request #10542 from PsiOmegaDelta/150812-HoloStools 
Holodeck stool icon fix.
 2015-08-12 10:28:12 -04: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
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
GinjaNinja32
8915edcce2 Merge pull request #10537 from mwerezak/mapping-fixes 
Fixes and mapping
 2015-08-12 06:39:30 +01:00
mwerezak
c70544f021 Fixes #10509 2015-08-12 00:58:40 -04:00
PsiOmegaDelta
163ac0de1e Merge pull request #10521 from GinjaNinja32/mirror_gender 
Mirrors no longer check the user's gender when finding the list of valid hairstyles
 2015-08-12 06:26:45 +02:00
GinjaNinja32
41965d93ef Mirrors no longer check the user's gender when finding the list of valid hairstyles 2015-08-12 01:00:43 +01:00
GinjaNinja32
056a14f4f4 Merge pull request #10504 from PsiOmegaDelta/150811-ForcedHardwareAcceleration 
Forces hardware acceleration.
 2015-08-11 20:54:02 +01:00
PsiOmega
242c9444ef Forces hardware acceleration. 
Most likely also fixes the hickup where BYOND still rending lights are blobs of light despite having hardware acceleration enabled.
Ports https://github.com/ParadiseSS13/Paradise/pull/1690. Fixes #10147 as much as it can be fixed I believe.
 2015-08-11 21:47:07 +02:00
PsiOmega
e4f6436a85 Fixes #10494. 
Borgs have their very own custom little headset, so cute.
 2015-08-11 21:11:16 +02:00
Chinsky
076e7d6788 Merge pull request #10432 from Baystation12/dev-freeze 
Dev freeze -> Master
 2015-08-11 20:13:49 +03:00
Chinsky
7b1656f40c Merge pull request #10470 from Karolis2011/dev-freeze 
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
 2015-08-11 20:07:06 +03:00
Zuhayr
20e7ee0b71 Merge pull request #10111 from mwerezak/eye-attack 
Makes grab eye attacking respect species lore better
 2015-08-12 02:36:50 +09:30
Chinsky
7f2d6e8b7f Merge pull request #10434 from Kelenius/ofCablesAndSnowflakes 
Of cables and snowflakes
 2015-08-11 19:40:45 +03:00
Zuhayr
7bd301161f Merge pull request #9988 from PsiOmegaDelta/150702-SpellFixes 
Magical fixes.
 2015-08-12 01:54:31 +09:30
PsiOmega
78ffb5835a Misc. 2015-08-11 17:33:03 +02:00
PsiOmegaDelta
edce8f73a4 Removes faulty attempt of garbage collecting. 2015-08-11 14:26:32 +02:00
PsiOmegaDelta
adda1d9448 Fixes #9158. 
Neither the value True nor False are null. Removes breaking null check
 2015-08-11 14:00:13 +02:00
PsiOmegaDelta
3185005496 Fixes #10410. Fixes #10411. 
Removes improper code, that would cause spell projectiles to be deleted pre-maturely as well as cast the spell effect all too often.
Also removes completely unused code.
 2015-08-11 13:36:56 +02:00
SomeoneElse
8c0984d5b1 Fix gender issues, some typos from various files 2015-08-11 13:41:40 +03:00
PsiOmegaDelta
54162f1c7d Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes 2015-08-11 12:20:54 +02:00
PsiOmegaDelta
211a427d65 Crew monitor balance and lag fixes. 
Creates a central repository for crew data. This repository only updates data as necessary and only every 5th second, no matter how many times it is requested.
Reduces any lag caused by having multiple crew monitor windows open and as a bonus gives antags a larger window of opportunity for disabling sensors before detection of harm.
 2015-08-11 09:27:18 +02:00
PsiOmegaDelta
e1aff6a668 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/machinery/doors/door.dm
	code/game/machinery/portable_turret.dm
 2015-08-11 08:21:06 +02:00
Chinsky
80c4158cc7 Merge pull request #10460 from PsiOmegaDelta/150809-NDVIcarus 
Fixes #10447.
 2015-08-10 20:45:11 +03:00
mwerezak
c98b6a1d97 Merge pull request #10457 from Zuhayr/dev-freeze 
Custom item rolldown.
 2015-08-09 10:33:54 -04:00
GinjaNinja32
575ab793a2 Merge pull request #10458 from PsiOmegaDelta/150809-DestroyBuildings 
Fixes #10217.
 2015-08-09 12:43:08 +01:00
PsiOmega
889f399356 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/area/areas.dm
	code/game/machinery/alarm.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2015-08-09 13:15:22 +02:00
PsiOmega
e0525bec35 Fixes #10447. 
Corrects Icarus' designation.
 2015-08-09 12:21:52 +02:00
PsiOmega
e350d888e6 Fixes #10217. 
Adds destroys to rectify the situation.
 2015-08-09 10:52:24 +02:00
PsiOmegaDelta
31b8335298 Merge pull request #10456 from mwerezak/air-alarm 
Fixes
 2015-08-09 10:09:02 +02:00
Zuhayr
b6e6d45952 Small tweaks to get rolldowns to work properly. 2015-08-09 17:01:07 +09:30
Zuhayr
aed2ac3dfe Moved custom_synthetic.dmi into a proper define. 2015-08-09 16:48:20 +09:30
Zuhayr
9d11a367a6 Roll-down-jumpsuit now works properly with custom items, icon_override and (hopefully) species variants. 2015-08-09 16:22:19 +09:30
mwerezak
b1b3b4899b Fixes #7928 
Uses camera/set_status() to ensure viewers are kicked and camera cache updated.
 2015-08-09 00:24:18 -04:00
PsiOmegaDelta
4ae754a59d Merge pull request #10454 from mwerezak/chem-machine-fix 
Fixes #10021
 2015-08-08 19:16:47 +02:00
PsiOmegaDelta
22c500ed2b Merge pull request #10452 from mwerezak/stump-fix 
Backports #10331
 2015-08-08 19:16:25 +02:00
mwerezak
4e70cc03bc Fixes #10021 2015-08-08 11:38:27 -04:00
mwerezak
1e3d3101de Fixes #9966 2015-08-08 11:28:22 -04:00
Kearel
4139a51946 Initial fixes 
Changes interaction between stumps and items.

Conflicts:
	code/modules/organs/organ_stump.dm
 2015-08-08 11:10:28 -04:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix 
Material stack related fixes
 2015-08-08 09:56:25 +02:00
HarpyEagle
fc7e89380e More material renames 
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
 2015-08-07 17:10:35 -04:00
PsiOmegaDelta
8ca5d01dcf Crematorium Destroy() 
Adds a missing Destroy() for the crematorium tray.
Changes X.loc = loc into X.forceMove(loc).
 2015-08-06 08:39:24 +02:00