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
25,681 Commits 6 Branches 0 Tags
616b4b60e4c8b6d1f6245aec2d24746f4bf0dc31
Commit Graph

428 Commits

Author SHA1 Message Date
Zuhayr
5e1ae26b74 Comment cleanup, adds TODOs for a bunch of minor things that the antag system may need to address before the end of freeze. 2015-07-14 05:19:01 +09:30
Mloc
ffbf547923 Merge pull request #9889 from PJB3005/bay-lights 
Lighting optimizations + NVG meson fix
 2015-07-09 14:50:10 +01:00
PsiOmega
7e33beab0f Fixes drone runtime. 
Spawning drones no longer cause runtimes. Fixes #9909.
 2015-06-28 19:02:23 +02:00
PsiOmega
6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm
 2015-06-26 19:22:31 +02:00
mwerezak
1b978f9570 Makes update_inv_head() respect item_state and item_icons 
Fixes #9873
 2015-06-26 01:34:15 -04:00
PJB3005
c48ffa8d63 Lighting optimizations + meson fix 2015-06-23 17:46:11 +02:00
Zuhayr
ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
mwerezak
0d6dfd899a Makes standard tables plastic 
Makes standard tables plastic, readds steel tables to various places,
mainly around engineering and maintenance. Makes shuttle tables
reinforced.
 2015-06-14 13:38:56 -04:00
PsiOmega
fbc4bfbe9c Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/setup.dm
 2015-06-07 10:30:27 +02:00
mwerezak
821285bcee Adds defines for bombcap components 2015-06-06 22:38:56 -04:00
Chinsky
ff592c751a Merge pull request #9483 from PsiOmegaDelta/150526-EndGameTweaks 
End game tweaks
 2015-05-31 23:55:08 +03:00
Zuhayr
201712eb3d Added MATERIAL_PADDING flag. 2015-05-31 17:19:32 +09:30
PsiOmega
bcb1ea5413 Endgame tweaks. 
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
 2015-05-26 12:29:50 +02:00
Chinsky
9d14bc41de Merge pull request #9389 from mwerezak/fire 
Fire
 2015-05-21 03:13:55 +03:00
mwerezak
953e8be44e Fire tweak 2015-05-19 00:09:37 -04:00
GinjaNinja32
76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables 
Conflicts:
	code/setup.dm
 2015-05-16 08:53:33 +01:00
Kelenius
10915eae24 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
 2015-05-15 11:28:05 +03:00
GinjaNinja32
354859b889 Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks 2015-05-15 04:47:18 +01:00
Zuhayr
4e85c5f387 Dev merge. 2015-05-12 23:33:29 +09:30
Zuhayr
da7bfd137b Renaming custom item icon files. 2015-05-12 21:39:46 +09:30
Zuhayr
49930fe55d Debugging! 2015-05-12 21:30:06 +09:30
Zuhayr
495952ff5d Changed steel material name to a define. 2015-05-12 13:08:41 +09:30
Zuhayr
e28acd5045 Dev merge. 2015-05-11 18:45:14 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
Mloc
16d50c645d new object-based lighting system 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 20:54:25 +01:00
Kelenius
873b38e0a5 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
 2015-05-04 22:36:35 +03:00
Chinsky
3d7bfd8aff Merge pull request #9007 from PsiOmegaDelta/Initialize 
Removes the need for spawn() in New() procs.
 2015-04-30 21:12:06 +03:00
Kelenius
317abc6b79 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
 2015-04-28 10:49:26 +03:00
PsiOmega
d59ff1e1f9 Begins work to remove the need for spawn() in New() procs. 2015-04-27 08:23:54 +02:00
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
Chinsky
e0c00bda55 Merge pull request #8973 from mwerezak/inventory2 
Inventory updates
 2015-04-26 20:13:21 +03:00
PsiOmega
e54fbcb9ec Cleans up borg module code and responsibilities. 2015-04-26 12:00:30 +02:00
Zuhayr
79e3acc95e Finalized wall refactor. 2015-04-26 12:58:57 +09:30
mwerezak
e50043fe99 Updates a few mask body cover flags, allows breath masks to be adjusted in hand 2015-04-24 22:00:51 -04:00
mwerezak
f86642a74e Updates clothing/under to use item_state_slots. 
Also fixes a lot of incorrect jumpsuit item_state values.
 2015-04-23 08:03:40 -04:00
mwerezak
3acfe5960e Renames inventory slot string key defines 2015-04-23 04:57:03 -04:00
mwerezak
1bbb19297e Implements item_state overrides for back slot, hands 
Updates backpacks to use the item_state overrides where necessary, fixes #8577
 2015-04-23 03:26:18 -04:00
PsiOmega
1511e2b3f4 Ports /vg/'s Nas-Sie remake. 
Second phase:
New Nar-Sie itself.
Two endgame phase - Nar-Sie and Supermatter Cascade.
Culty mobs.
 2015-04-12 16:19:16 +02:00
Chinsky
7a40d193fe Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen 
Refactors NanoUI interaction (again)
 2015-04-11 04:43:50 +03:00
PsiOmega
e37c5c22d4 Refactors NanoUI interaction (again) 
Takes NanoUI interaction code and splits it into more manageable modules.

The default handler that checks distances, camera coverage, etc., etc.
Admin NanoUI windows now only check for admin rights, ignoring sight, distance, and anything else.
ERT/mercenary appearance changer now remains open for as long as the mob remains on the admin Z-level.
PDAs and uplinks now require that you keep the item somewhere in your main inventory (or contents to be precise). Hands or ears are fine, inside bags are not.
Rig suits also check that they are in the operator's inventory or that the synthetic operator is somewhere within the suit's contents (recursively).
 2015-04-10 11:19:38 +02:00
PsiOmega
990530d118 Ports /vg/'s spell system for the sake of cult porting. 
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
 2015-04-09 20:08:06 +02:00
Chinsky
4a897e47b9 Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork 
Cult Visual network
 2015-04-06 20:19:49 +03:00
volas
2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
PsiOmega
56a8195d1c Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork 
Conflicts:
	code/setup.dm
 2015-04-01 12:47:31 +02:00
Kelenius
41ff9819bd Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-03-31 17:44:42 +03:00
Chinsky
65f61122b5 Merge pull request #8604 from Zuhayr/limbs 
Limb objects, severing and cybernetics
 2015-03-31 08:38:54 +03:00
mwerezak
9ad533a094 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/monkey/update_icons.dm
	code/modules/mob/mob_helpers.dm
	code/modules/spells/spellbook.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2015-03-31 00:16:56 -04:00
=
2e728cfd4b Added macros for droplimb flags. 2015-03-31 11:42:45 +10:30
=
601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
PsiOmega
a9034bca66 Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork 
Conflicts:
	code/modules/mob/living/simple_animal/shade.dm
	code/setup.dm
 2015-03-30 22:55:24 +02:00