cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,599 Commits 5 Branches 0 Tags
90378111e1363048b396fca2731613e545f80fdd
Commit Graph

358 Commits

Author SHA1 Message Date
Mloc
90378111e1 Fixes #3777 
Signed-off-by: Mloc <colmohici@gmail.com>
 2013-10-16 11:21:51 +01:00
Chinsky
a7be4d9353 Fixes #3781 
Magical thingies now go zzap instead of click click when empty.
 2013-10-16 11:06:43 +04:00
Aranclanos
9af5c85c58 Duplicates the speed of the gameticker! 
The emtiter beams were holding back the gameticker, 0.3 seconds per beam, now the sleep() is replaced with a spawn() instead.

This will add lag due to everything being faster.
 2013-10-13 17:11:39 -03:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
jack-fractal
474f44645d Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-12 00:10:12 -04:00
jack-fractal
e73c06e51c Fixing a bug in the cyborg taser that caused it to continue draining cell-power from the cyborg even after it had finished recharging. 2013-09-11 23:33:23 -04:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Chinsky
cafa176548 Merge pull request #3647 from SkyMarshal/patch-2 
ZAS fix, Stops lasertag guns from killing you if you shoot it into your mouth.
 2013-09-04 07:20:15 -07:00
SkyMarshal
99bf9db04c Fixes lastertag guns killing you if you stick it in your mouth. 2013-09-03 22:51:37 -07:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
5d1c4548fa Cell.use checks instead of just minuses. Yay for code! 2013-09-01 00:16:11 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Mloc-Argent
e2e747fa0a Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 2013-08-13 22:21:09 +01:00
meyar
551fee16eb Removes nook awps stunlock. Nerfs SAW back to where it should be, 25 damage, not 60. Fuckin' SAW. 2013-08-13 16:51:48 -04:00
Mloc-Argent
71bdaa1698 Fully reverts clickdelay change. 
It was immensely buggy with certain mobs, and server lag all but negated the benefits.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-08-13 13:10:09 +01:00
Segrain
292b04399c Doublesuperheating fix. 2013-08-08 02:43:23 +03:00
Zuhayr
6f9b6e9704 Fixed language datum comparison, fixed staff of change runtime. 2013-08-06 07:33:07 -07:00
Zuhayr
98bbb095ad Swapped languages and datums over to global lists. Updated verbs. 2013-08-05 20:34:38 -07:00
Zuhayr
b875ff021b Vast array of changes to replace mutantrace with species datum 2013-08-03 15:08:54 -07:00
Mloc-Argent
9d2e107005 Reactiveness update part 1: Removed click delays from most objects, keeping them on for attacks and breaking windows/grilles. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-25 18:30:24 +01:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
Mloc-Argent
cf53dd7a10 Revert "Adds in the Kida" 
This reverts commit a2fddc0fc1.
 2013-07-12 12:22:35 +01:00
comma
bdaeb2c6fb Adds fire delay to all weapons (except automatics). 
For most weapons it is only slightly bigger than clicking own delay, but still can see difference between revolver and SMG.
Shotungs do not get special delay because they are slow as they are anyway.
Biggest delays go to laser cannon (40 damage per shot) and pulse rifle, ~2 seconds for one shot.
 2013-07-10 21:19:21 +04:00
Zuhayr
b33e91fbb1 Cleaned up a lot of the module selection code, added Combat module. 2013-06-29 22:14:43 -07:00
Zuhayr
94c3c7ef49 Armalis additions, tweaks. 2013-06-16 13:17:20 -07:00
Zuhayr
23299809f6 Armalis sprites, simple animal/mob yank-out verb and embedding. 2013-06-16 00:38:40 -07:00
Zuhayr
5c15ce687c SHUT UP SPAMCAT. Bow fix, vox raider message fix. 2013-06-15 14:18:40 -07:00
Zuhayr
b41b1fc2f3 Armalis simple_animal/sprite. 2013-06-15 04:09:49 -07:00
Zuhayr
b1cac56e9a Merge resolution. 2013-06-15 03:54:22 -07:00
Zuhayr
3cb36272cb Adjusted yank verb to apply to others as well as yourself. 2013-06-13 22:18:26 -07:00
Zuhayr
6b73b8ec2f Adjusted kitchen knives. Added projectile pinning. Various tweaks. 2013-06-13 20:46:09 -07:00
Zuhayr
4aa577bef3 Powered crossbows, sprites, ammo. 2013-06-13 15:31:47 -07:00
NicholasDV
a2fddc0fc1 Adds in the Kida 
Adds in the Kida Race to all parts.
 2013-06-13 18:22:05 -04:00
Zuhayr
c57f2bb137 Polished off some pneumatic cannon bugs. All done. 2013-06-11 12:19:20 -07:00
Zuhayr
96d9a41ea7 Pneumatic cannon sprites, gas loss code. 2013-06-11 00:57:15 -07:00
Zuhayr
0fb234d6a4 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-06-10 22:35:42 -07:00
Zuhayr
98d31e9191 Preliminary work for pneumatic cannons (WIP, no sprites, broken gun) 2013-06-10 22:35:01 -07:00
MisterBook
b835ab4bd2 Fix of breacher chasis to keep anyone but Ughanti from wearing it. 
Fix of gun suicide - lethal is lethal, nonlethal just hurts like a mother.
Despamming electrode resistance.
 2013-06-09 14:10:11 -05:00
Zuhayr
8b518f5639 Sprites and equipment for a psychic villain wizard variant. Mental focus is fairly experimental. 2013-06-08 19:20:02 -07:00
MisterBook
8e401489e7 Making sure I don't break anyone else calling apply_effects. 2013-06-06 19:50:32 -05:00
MisterBook
a34174e124 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-05 18:39:43 -05:00
Zuhayr
06f04e6374 Vox mutantrace, vox clothing, minor surgery mod for mutantrace specific surgery steps. Fixed captain's jacket sprite. 2013-06-05 17:35:38 +09:30
MisterBook
f240edcdb8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-04 22:42:45 -05:00
MisterBook
fd8d61aa8b New taser fix is now in place. Rather than full deflection, armor mitigates the damage. Updates along all sorts of Clothing for minor mitigations to major mitigations. 
New define - AGONY. Used as an effect (Like STUN, WEAKN, etc) to cause HALLOSS. Allows use of HALLOSS projectiles without having to worry about them shattering windows/grilles. Future use? Torture tools, pain inducers for interrogation, 'Be Good' modules, Meme, etc.

HALLOSS now regens while standing up (2 per tick), and laying down (Resting, unconscious, paralyzed - 6 per tick). This fixes the 'real damage + HALLOSS = forever crit'.

Sticking a gun in your mouth (Non-stun, damage inducing) and pulling the trigger kills you.

Icon adjustments.
 2013-06-04 22:41:23 -05:00
Chinsky
b2aeed8fba Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-01 08:26:43 +04:00
Chinsky
4749d6016d Made syringe gun work with aiming system. 2013-06-01 08:23:38 +04:00
Asanadas
2d6bb6a768 Merge pull request #2934 from Baystation12/master 
Bleeding Edge gonna bleed.
 2013-05-31 21:12:37 -07:00