cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,229 Commits 8 Branches 0 Tags
00fa623c9d9119245998b51bc8d1cc8d7390aea4
Commit Graph

12408 Commits

Author SHA1 Message Date
GinjaNinja32
005dcda1d5 Macro count update, fixes span tag 2015-08-11 18:52:24 +01:00
GinjaNinja32
ea76feb3cd Compile fix 2015-08-11 18:47:25 +01:00
GinjaNinja32
631ff21980 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/game/objects/items/weapons/implants/implantcase.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/modules/mob/living/carbon/human/emote.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/silicon/robot/drone/drone.dm
	code/modules/mob/living/silicon/robot/emote.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/nano/modules/crew_monitor.dm
	code/modules/organs/organ_internal.dm
 2015-08-11 18:47:05 +01: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
39825d6810 Secret entries can now give a warning before being triggered. 2015-08-11 15:03:57 +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
4bb6749f24 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-11 08:34:46 +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
HarpyEagle
8cbd14c1a5 Splits up projectile/launch() 2015-08-10 19:00:38 -04:00
HarpyEagle
53affb4e44 Projectile cleanup 
Moves projectile trajectory related setup into setup_trajectory(), removes
redundant target var on test projectiles.
 2015-08-10 18:56:41 -04:00
Hubblenaut
3fb52ab4d5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2015-08-11 00:51:18 +02:00
HarpyEagle
ad54aca3ab Streamlines gun firemodes 
Gun firemodes now work by setting vars on the parent gun item. Removes the
need to unpack a bunch of firemode values when shooting and the need for
certain guns to define special firemode types.
 2015-08-10 14:38:08 -04:00
Chinsky
80c4158cc7 Merge pull request #10460 from PsiOmegaDelta/150809-NDVIcarus 
Fixes #10447.
 2015-08-10 20:45:11 +03:00
PsiOmega
2f4c71ddbc Renames definition and compilation fix. 2015-08-10 18:00:50 +02:00
PsiOmega
570806046b Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/mob/living/silicon/robot/custom_sprites.dm
	code/modules/organs/organ_stump.dm
	code/setup.dm
 2015-08-10 17:56:14 +02: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
Neerti
f407f9aa22 Merge pull request #137 from Woodratt/Woodrat_Work_7.8 
Woodrat Work 7.8 "Tiny mini skirt edition"
 2015-08-09 02:29:38 -04:00
Woodrat
b8c0c5ca5d Woodrat Work 7.8 "Tiny mini skirt edition" 
- Added jumpskirts to their department lockers.
- Fixed minor code issue with the QM skirt
- Single scientist wardrobe added to research rest room
- Removed robust cola machine from gateway, added laptop vendor in its stead.
- Two universal recorders added to the main map. Captain's office and art storage.
- Adjusted and added cameras to the doc area to improve coverage.
- Adjusted cameras in primary hallway leading to the dock for coverage purposes.
- Added newscaster to central park.
- Finalized work on the large dorms/visitor housing.
- Added CM sprite for frag grenades for our grenades, also lessened the size of the explosion to (-1,-1,3) from (-1, -1, 4) in a vain attempt to make the blast radius smaller. They shouldn't be too much weaker but...
- Sprite for a box of frag grenades added, box of 7 frag grenades also added to code.
- Two merc op TTVs removed, one left behind. One box of frags and 6 blocks of c4 added to merc op shuttle in their stead.
- One box of frag grenades added to ERT armory.
 2015-08-08 23:18:39 -07:00
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
Mark9013100
1b014ef703 Minor ERT/Central changes 2015-08-08 14:21:00 -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
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
 2015-08-08 15:34:51 +02:00
Mark9013100
17b6d4e3c7 Sec soft cap sprite improvements & ERT rig pathfile 2015-08-08 08:40:56 -04:00
Mark9013100
b601310f9b Men in black 2015-08-08 06:01:35 -04:00
PsiOmegaDelta
c560bd8d79 Merge pull request #10404 from mwerezak/stack-fix 
Material stack related fixes
 2015-08-08 09:56:25 +02:00
Neerti
1c8a395bcf Adds jumpskirts for engineering, medical, and cargo. 2015-08-07 23:39:40 -04:00
Neerti
9e6eef57f7 Makes windows require only one sheet per window if it's not a 'full' window. 2015-08-07 21:34:04 -04:00
Neerti
a8c4245245 Merge pull request #129 from Neerti/8/7/2015_bay_merge 
Syncs to Bay (8/7/2015)
 2015-08-07 20:33:48 -04:00