cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-09-01 00:16:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,767 Commits 66 Branches 25 Tags
177d9689330679f32045d00aaccc2d0cbcb92a05
Commit Graph
9361 Commits
Author SHA1 Message Date
Mustafa Kalash 177d968933 Changes flour sacks to a condiment, so that players will be able to pour flour straight into beakers, instead of having to use the grinder first. 2015-04-06 18:40:11 -04:00
Chinsky 4a897e47b9 Merge pull request #8641 from PsiOmegaDelta/CultVisualNetwork 
Cult Visual network
 2015-04-06 20:19:49 +03:00
Chinsky cbfa0ef0e8 Merge pull request #8759 from PsiOmegaDelta/NewThermals 
Thermal/NVG changes.
 2015-04-06 20:14:39 +03:00
PsiOmegaDelta fd1b6343f0 Merge pull request #8655 from volas/sanitize_procs2 
sanitize(), part 2
 2015-04-06 15:16:17 +02:00
PsiOmega d3a1ddfa09 Thermal/NVG changes. 
Thermals/NVGs can now be toggled on/off from the GUI action bar, same as mesons.
Adds charge sound for special goggles.
 2015-04-05 09:54:55 +02:00
Chinsky c86706f0d3 Merge pull request #8699 from mwerezak/docking-update 
Adds docking support for multishuttles
 2015-04-05 09:49:59 +03:00
Mustafa Kalash 94a56e3c2b Adds a toggle for allowing a target to use a radio (handheld or headset.) 2015-04-03 17:42:16 -04:00
mwerezak 2217407dca Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into docking-update 2015-04-03 15:14:44 -04:00
mwerezak f2e816e76e Merge remote-tracking branch 'upstream/dev' into docking-update 2015-04-03 15:04:32 -04:00
PsiOmega 8e55ad8114 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/mob.dm
 2015-04-03 09:33:05 +02:00
PsiOmega 4326b8c5d8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-04-03 09:22:23 +02:00
volas 2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
Chinsky 96dd9df079 Merge pull request #8704 from Zuhayr/dev 
Fixes
 2015-04-02 23:49:54 +03:00
Chinsky c584155edd Merge pull request #8688 from PsiOmegaDelta/Events 
Adds more events, misc event changes.
 2015-04-02 23:43:45 +03:00
GinjaNinja32 e82894aadc Fixes runtime when attempting to latejoin into a deleted core 2015-04-02 05:16:20 +01:00
mwerezak a116723fcd Updates canister process() to use atmos helper procs 2015-04-02 00:04:44 -04:00
Zuhayr 84b903cf69 Fixes #8702 properly. 2015-04-01 17:57:28 -07:00
Zuhayr c3eb6102b4 Added a few null checks. 2015-04-01 17:15:59 -07:00
Zuhayr 93a63134b1 Fixes #8711 2015-04-01 16:56:59 -07:00
Zuhayr 8475be5d4e Fixes a few incidental bugs with the antag and organ changes. 2015-04-01 06:33:47 -07:00
Zuhayr 03d5c2a5cd Fixes #8619 2015-04-01 05:55:34 -07:00
PsiOmega 56a8195d1c Merge remote-tracking branch 'upstream/dev' into CultVisualNetwork 
Conflicts:
	code/setup.dm
 2015-04-01 12:47:31 +02:00
mwerezak 7366df388b Merge remote-tracking branch 'upstream/dev' into docking-update 2015-03-31 20:50:02 -04:00
mwerezak 01ce8d4a1f Fixes #8696 
Fixes #8696, and updates other usages of drop_item() where appropriate.
 2015-03-31 20:30:06 -04:00
PsiOmega 93ac826f02 Adds more events, misc event changes. 
Only two more this time:
Random space dust attack.
Random gravity failure.

Moves space vines from moderate to major events, due to its now more dangerous nature.

Removes now irrelevant alien/ninja customized event handlers.

Adds Excel sheet for aiding in event probability calculations.
 2015-03-31 13:07:27 +02:00
mwerezak 398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/modules/organs/organ_external.dm
 2015-03-31 02:13:22 -04:00
Chinsky 65f61122b5 Merge pull request #8604 from Zuhayr/limbs 
Limb objects, severing and cybernetics
 2015-03-31 08:38:54 +03:00
mwerezak 9b2f5cea33 Merge remote-tracking branch 'upstream/dev' into inventoryfix 
Conflicts:
	code/game/gamemodes/revolution/rp-revolution.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/modules/destilery/main.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/carbon/monkey/inventory.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
 2015-03-31 01:37:55 -04:00
Zuhayr 6ac0791a0e Merge pull request #8654 from PsiOmegaDelta/NullRefAccess 
Fixes occasional issue with req_(one_)access being null.
 2015-03-31 15:50:52 +10:30
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
Zuhayr 3472513cf9 Merge pull request #8645 from mwerezak/gun-icons 
Adds Skowron's inhand icons for various guns
 2015-03-31 14:12:03 +10:30
mwerezak cdfce64ad0 Replaces uses of u_equip() with remove_from_mob() or drop_from_inventory(), where appropriate. 2015-03-30 22:05:00 -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
Chinsky a8ee3ca25e Merge pull request #8560 from PsiOmegaDelta/PCAILaws 
PC AI laws.
 2015-03-30 21:23:34 +03:00
PsiOmega ef8b7466ac Merge remote-tracking branch 'upstream/dev' into NarsiePort 
Conflicts:
	code/modules/projectiles/projectile/change.dm
 2015-03-30 20:17:05 +02:00
Chinsky 056c00fc9a Merge pull request #8671 from Yoshax/spellfixes 
Updates spellbook descriptions and cooldowns
 2015-03-30 21:15:08 +03:00
mwerezak 1b4e13aabc Removes unnecessary and cruft procs from mob/inventory.dm 2015-03-30 05:28:09 -04:00
Yosh c1b7ca3b89 Further description fixes 2015-03-30 01:17:57 +01:00
Yosh e9125474dd Spellbook spell description update 
Updates what obvious problems in the descriptions I could see.
 2015-03-30 01:12:23 +01:00
Yosh 57a8822c43 Spellbook cooldown corrections 
Displayed cooldowns in the wizard's spellbook were partially incorrect,
fixed now to display the correct cooldowns.
 2015-03-30 01:01:12 +01:00
= d77010221c Merge with dev. 2015-03-30 08:36:52 +10:30
Yosh 42cb430f02 Changes ED-209 Construction to work with new armor vests 
Changes ED-209 construction to accept any type of the newer armor vests
rather than the old mostly deprecated armor vests.
 2015-03-29 18:05:07 +01:00
PsiOmega 710abd0921 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/spells/mind_transfer.dm
 2015-03-29 16:23:06 +02:00
PsiOmega 1a000b0e0f Merge remote-tracking branch 'upstream/dev' into NarsiePort 
Conflicts:
	code/modules/mob/living/carbon/human/say.dm
 2015-03-29 13:04:53 +02:00
PsiOmega 486c30d34e Fixes occasional issue with req_(one_)access being null. 
Refactors the code a bit as well.
 2015-03-29 12:46:43 +02:00
PsiOmega 464d702d4b Mob refactoring. 
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
 2015-03-29 10:44:31 +02:00
mwerezak c59fac2e16 Adds unloaded item state for the STS-35. 2015-03-29 02:40:57 -04:00
mwerezak ba9b8756da Allows items to specify which icon files are used for specific slots, moves gun icons to a separate file 2015-03-29 01:52:26 -04:00