cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-20 23:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,691 Commits 7 Branches 0 Tags
037a901b2283018942f425e7347669597d571c4d
Commit Graph

11696 Commits

Author SHA1 Message Date
PsiOmegaDelta
5d13f3091c Merge pull request #9067 from Jarcolr/gauniform 
Adds foxeye's approved custom item
 2015-05-02 21:19:22 +02:00
Jarcolr
471988b080 Adds foxeye's custom item 
http://baystation12.net/forums/viewtopic.php?f=33&t=12421
 2015-05-02 11:19:52 +03:00
volas
93d120a24c merge fix 2015-05-02 11:16:15 +03:00
Chinsky
d5495870d1 Merge pull request #9045 from mwerezak/resist 
Resist code cleanup, plus fixes
 2015-05-02 08:22:51 +03:00
Chinsky
aeda1db3c5 Merge pull request #9041 from PsiOmegaDelta/ChitterChitter 
Fixes #9029.
 2015-05-02 08:22:09 +03:00
Chinsky
8f1a9a9375 Merge pull request #9040 from PsiOmegaDelta/LOOCToggle 
Admins can now toggle OOC and LOOC separately from each other.
 2015-05-02 08:21:50 +03:00
mwerezak
3509178aa8 More resist refactoring 
Reorganizes resist a bit more to allow for cleaner inheritance.
 2015-05-01 15:13:07 -04:00
Ccomp5950
3baed4686e Merge pull request #9039 from PsiOmegaDelta/QdelBullet 
Fixes #9037.
 2015-05-01 10:45:10 -04:00
PsiOmega
b34e44ab84 Mice are now numbered. 
You are not a man. This should also make things easier for admins.
 2015-05-01 08:54:05 +02:00
mwerezak
8b32d2356e Fixes #9044 
Apparently stunned ticks down after grabs are updated.
 2015-05-01 02:09:43 -04:00
mwerezak
98a4f54b88 Adds span classes, moves secure closet procs 2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279 Resist verb cleanup 
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
 2015-05-01 01:23:26 -04:00
Atlantiscze
134eee0c6c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into nanocrusade-two 2015-04-30 23:42:38 +02: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
PsiOmega
fcfdcecd3a initialize() should now always be called, be it on game starting up or object being created after game start. 
Partially fixes #9036.
 2015-04-30 19:28:35 +02:00
PsiOmega
990b7b81a8 Another potential qdel sanity check. 2015-04-30 14:37:52 +02:00
PsiOmega
a49e6035a9 Fixes #9029. 
Reduces the announcement message delay for spiders from 800-900 seconds to 180-300 seconds.
Number of spiders now based on severity, with a moderate level event spawning as many spiders as before.
 2015-04-30 10:22:58 +02:00
PsiOmega
82a8f32783 Admins can now toggle LOOC separately from OOC. 
Also includes what I image to be proper permission checks for toggling the various OOC channels.
 2015-04-30 09:52:29 +02:00
PsiOmega
40f0901e3d Fixes #9037. 
Just one of many potential qdel issues. More to come, yay.
 2015-04-30 09:35:57 +02:00
PsiOmega
f72fe0d194 Merge remote-tracking branch 'upstream/master' into dev 2015-04-30 08:09:25 +02:00
Yoshax
233b9a5d11 Adds Sabess' custom item 2015-04-29 16:47:20 +01:00
Yoshax
2c4783386f Removes CE's hardhat 2015-04-29 16:11:53 +01:00
Kelenius
4500eac948 Merge and removal of a wild file 
Merge branch 'dev' into ofChemistryAndStuff

Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
 2015-04-29 14:20:44 +03:00
Kelenius
bd6a8e4d54 Chemistry-Holder.dm: absolute paths 2015-04-29 13:53:04 +03:00
Chinsky
34bbe33030 Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI 
Portable atmospheric pump/scrubbers now use NanoUI.
 2015-04-29 09:43:47 +03:00
Yoshax
e5cd8c7adb Fixes jacket 2015-04-28 20:40:16 +01:00
Yoshax
6c8bc809c6 Adds more items to custom loadout 2015-04-28 20:37:57 +01:00
PsiOmegaDelta
851d5423f3 Merge pull request #8971 from mwerezak/burst-fire 
Gun firemode system, burst firing
 2015-04-28 20:24:03 +02:00
Zuhayr
cc19bbb604 Merge pull request #8972 from DeeUnderscore/paper-functionality 
Paper functionality additions
 2015-04-29 02:46:21 +09:30
Kelenius
a2cea5c49c Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm
 2015-04-28 19:22:35 +03:00
mwerezak
19aff88b90 Fixes #9017 2015-04-28 12:22:21 -04:00
Zuhayr
74db1f71b5 Merge pull request #9018 from Kelenius/ofChemAndTwo 
Chemistry recipes: absolute pathing
 2015-04-29 00:15:20 +09:30
Kelenius
185aadb5a9 Chemistry recipes: absolute pathing 2015-04-28 16:55:13 +03:00
Chinsky
04b994f939 Merge pull request #9008 from PsiOmegaDelta/CameraPoff 
Adds the APC & camera damage events.
 2015-04-28 13:49:50 +03:00
Kelenius
948252d25b Removes unused files added by accident, separates reagent files 2015-04-28 11:00:56 +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
86d2fa5f61 Build fixes. 2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
 2015-04-28 08:43:31 +02:00
PsiOmegaDelta
bf43270624 Merge pull request #9015 from Kelenius/ofChemAndOne 
Chemistry update - part one
In spite of the sassy tone.
 2015-04-28 08:39:27 +02:00
Kelenius
d9e2947b32 Updates chemistry colors 2015-04-28 09:23:39 +03:00
mwerezak
9d9de73f03 Firemode bugfixes 2015-04-28 02:09:39 -04:00
mwerezak
472b284f24 Adds hitscan to the heavy sniper projectile 2015-04-28 02:08:12 -04:00
mwerezak
e93e9c1434 Expands firemodes to include energy gun settings 
Expands on firemodes to include settings for the egun/adv egun,
floraray, and pulse rifle.

By default attack_self() now cycles firemodes for any gun. Updates
several projectile guns in a desperate attempt to avoid the need for an
unload ammo verb.
 2015-04-28 02:06:54 -04:00
PsiOmegaDelta
bb7cd10cbb Merge pull request #8984 from volas/master 
Fixes #8913
 2015-04-28 07:53:45 +02:00
Chinsky
0ff3d9af99 Merge pull request #9005 from mwerezak/master-fixes 
Fixes (master)
 2015-04-28 06:26:32 +03:00
Chinsky
afa82e5d83 Merge pull request #9003 from mwerezak/dev-fixes 
Fixes
 2015-04-28 06:26:22 +03:00
Chinsky
1328414485 Merge pull request #8960 from mwerezak/item-color 
Fixes #8577, cleans up item_color, clothing/under and backpacks
 2015-04-28 06:25:35 +03:00
volas
59e17f7a9b small fix 2015-04-28 00:41:14 +03:00
mwerezak
36d9944dfd Fixes #8977 2015-04-27 14:55:18 -04:00
mwerezak
d0615430ec Fixes #8997 
Gibbing a human now causes all items on or in their person to get thrown around.
This includes implants and bullet shrapnel.
 2015-04-27 14:48:55 -04:00