cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,375 Commits 10 Branches 0 Tags
521a79450b296d6902aa9769d7370f9ab9b49d95
Commit Graph

24110 Commits

Author SHA1 Message Date
Anewbe
521a79450b Shriek emp is logged again 2016-11-07 21:40:50 -06:00
Anewbe
0a8a7b6191 Ling stings and absorb are logged 2016-10-18 17:21:35 -05:00
Neerti
96767a6d05 Merge pull request #2647 from Anewbe/flashlight_device_cells 
Flashlights use device cells
 2016-10-16 17:34:54 -04:00
Neerti
b2e3f37213 Merge pull request #2620 from redstryker/ICEMTUC 
Emergency Medical Response Voidsuit
 2016-10-16 17:30:19 -04:00
Neerti
561e2709dd Merge pull request #2622 from Anewbe/actual_embed_changes 
Changes the way embedding works
 2016-10-16 17:27:52 -04:00
Neerti
b0ebe0e4eb Merge pull request #2648 from Anewbe/tape_roll 
One requires a grip to use tape rolls on people
 2016-10-16 17:26:53 -04:00
Neerti
78a1e1cf48 Merge pull request #2631 from MagmaRam/bloodloss 
Bloodloss balancing
 2016-10-16 17:26:41 -04:00
MagmaRam
e066506ccb Blunt weapons can no longer cause cuts. 
This is a necessary change for the intended effect of this bloodloss
system.
 2016-10-16 15:53:04 -05:00
MagmaRam
289d32c23a Used the wrong defines for the organ tags, whoops. 2016-10-16 15:52:17 -05:00
Anewbe
44ac6b1b58 Tape rolls need to get a grip 2016-10-16 15:29:48 -05:00
Neerti
f7706373b2 Merge pull request #2646 from Anewbe/device_cell_fixes 
Fixes device cells
 2016-10-16 14:51:36 -04:00
Anewbe
bea401be2d Fixes device cells 2016-10-16 13:42:16 -05:00
Anewbe
d76e4cd075 Flashlights use device cells 2016-10-16 13:30:38 -05:00
Anewbe
ced74308e9 Fixes some Cargo crate issues 2016-10-16 13:21:05 -05:00
Anewbe
591d2719f3 Should fix penlights asking for cells 2016-10-14 21:29:03 -05:00
MagmaRam
c10b145782 Made bleeding from staunched wounds dynamic 
yoshax did the thing etc
 2016-10-13 22:36:00 -05:00
Neerti
72715b40d8 Merge pull request #2638 from Anewbe/track_spell 
Fixes the bug where the Track spell doesn't go away when dropped
 2016-10-13 22:29:27 -04:00
Anewbe
01b4c80ce4 Fixes Track spell 2016-10-13 18:27:28 -05:00
Anewbe
7a26fa94e3 Fixes the world >> "no sound" issue 2016-10-13 18:06:42 -05:00
Anewbe
0def0f6789 Flashlight fixes 2016-10-12 23:20:19 -05:00
MagmaRam
b141a993de More tweaks that Yoshax should get credit for 2016-10-12 22:02:56 -05:00
MagmaRam
45d1dcc966 Merge branch 'bloodloss' of https://github.com/MagmaRam/polaris 2016-10-12 22:00:33 -05:00
Neerti
955b5d1525 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/12/2016_overload_correction 2016-10-12 19:28:51 -04:00
Neerti
9404ad98fd Overload Description Correction 
Overload should correctly state how much damage it does, which is 0.3% of current charge, or 0.4% with the scepter of enhancement.
 2016-10-12 19:26:39 -04:00
MagmaRam
38a037edb3 Optimization tweak, credit to Yoshax 2016-10-12 15:59:18 -05:00
MagmaRam
bdf3dde514 Readd bleeding from open surgery stages. 2016-10-12 07:28:22 -05:00
MagmaRam
0fd5631c27 Bloodloss now depends on wound type and limb 2016-10-12 07:20:35 -05:00
MagmaRam
59d2608fbb Bruises now bleed at a much higher damage threshold. 2016-10-11 22:28:57 -05:00
Anewbe
5bfc0c851e Changes the way embedding works 2016-10-11 21:29:49 -05:00
Eearslya
66342af864 Fix solar assembly behavior while in inventory 2016-10-10 03:03:48 -07:00
Yoshax
b9e871bf5b Quick flashlight fix 2016-10-10 02:27:58 +01:00
redstryker
dbe19bdbd3 Emergency Medical Response Voidsuit 2016-10-09 14:55:53 -04:00
Neerti
32f87cac86 Merge pull request #2617 from Anewbe/cryo_batteries 
Cryopods no longer eat the cells/ammo from weapons
 2016-10-09 13:25:03 -04:00
Neerti
2e5c127ac8 Merge pull request #2616 from Anewbe/low_emp 
Fixes low-yield EMP grenades
 2016-10-09 13:24:56 -04:00
Neerti
46bade4426 Merge pull request #2615 from Anewbe/batteries_again 
Batteries again
 2016-10-09 13:24:51 -04:00
Anewbe
bfb6857a26 Gives Chain Lightning an icon 2016-10-08 20:28:41 -05:00
Anewbe
7cf2373da8 Cryopods no longer eat the cells/ammo from weapons 2016-10-08 19:51:39 -05:00
Anewbe
dacbca746c Fixes low-yield EMP grenades 2016-10-08 19:38:49 -05:00
Anewbe
771d8b9e4b Adds a smaller device cell for use in non-weapon devices 2016-10-08 15:34:18 -05:00
Anewbe
9ff32b5914 Weapon Cell Oversight fixes 2016-10-07 21:48:21 -05:00
Anewbe
f4aeb10fdc Merge pull request #2606 from Yoshax/flashlights 
Makes flashlights use cells
 2016-10-07 21:26:13 -05:00
Yoshax
5fc4c4b889 Removes cell randomization and ensures slime flashlight things arent weird 2016-10-08 03:18:48 +01:00
Neerti
5a72ab5f48 Revert "Revert "Revert "Revert "Revert "Revert "Adds hub passwordu"""""" 2016-10-07 21:15:43 -04:00
Anewbe
5febffea2f Merge pull request #2590 from SpadesNeil/jukebox-v2 
Jukebox Hacking. Again. Now with 100% less copyrights.
 2016-10-07 17:18:24 -05:00
Yoshax
24953efe7a Fixes some issues 2016-10-07 18:00:48 +01:00
Yoshax
087b9072e0 Adds changelog 2016-10-07 16:15:25 +01:00
Yoshax
a723eb3732 Makes flashlights use cells 2016-10-07 15:59:24 +01:00
redstryker
2331487ac0 Overseer Alt Title 2016-10-07 00:05:34 -04:00
Spades
85e3f0e40e Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into jukebox-v2 
# Conflicts:
#	polaris.dme
 2016-10-06 23:54:45 -04:00
Anewbe
006197dbc6 Merge pull request #2603 from Yoshax/minorbugfixboogalo 
Some bugfixes
 2016-10-06 22:38:32 -05:00