cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,632 Commits 7 Branches 0 Tags
e54843b7fca32429b5cb314f6b0227bae87d7fc5
Commit Graph

17658 Commits

Author SHA1 Message Date
Neerti
bc331befd9 Merge pull request #5576 from Anewbe/dermal_implant_fix 
Dermal implant doesn't cover hair
 2018-09-19 16:08:28 -04:00
Anewbe
3d4bed20c2 Merge pull request #5548 from Poojawa/pls-stop-moosic 
Ports /vg/ instrument frame work, adds client based sound pref toggle.
 2018-09-19 15:04:06 -05:00
Anewbe
d5979ec960 Merge pull request #5575 from Woodratt/09172018_spacesuitmess 
Rig and Spacesuit additions
 2018-09-19 15:00:30 -05:00
Woodratt
5a312e14d1 Update combat.dm 2018-09-19 12:11:11 -07:00
Anewbe
596e51da42 Dermal implant doesn't cover hair 2018-09-18 13:15:51 -05:00
Atermonera
c8dc627af4 Merge pull request #5573 from Mechoid/Blob2_Revenge_Of_The_Blob 
More Blob modularity / Event-Manager compatability, Nests.
 2018-09-18 11:11:51 -07:00
Woodratt
9f24c4eba2 Rig and Spacesuit additions 
- Added the 'military' Rigsuit from Bay.
- Added 'pmc' rigsuits
- Added exploration and pilot voidsuits along with alternate sprites (alternate sprites done by Naidh)
- Addition of suit cyclers for exploration and pilot voidsuits

None of these suits are currently accessible in game outside of admin bus. Currently only the pilot voidsuits have other species sprites. Exploration suits are missing sprites for Teshari (Naidh made some for their alternates but I have to add them) and the rig suits are human only. This is to be fixed in the near future, just wanted to get the make workload actually in the game first.
 2018-09-18 00:35:06 -07:00
Atermonera
f2ac15be91 Merge pull request #5511 from Anewbe/descriptors 
Ports character physical descriptors from Bay
 2018-09-17 11:21:28 -07:00
Atermonera
ee95a53d98 Merge pull request #5563 from Mechoid/We_are_going_to_Cyber_Space 
Cybersuit is now a space rig.
 2018-09-17 11:17:49 -07:00
Atermonera
77ef274b98 Merge pull request #5553 from Mechoid/VroomVroom 
Vehicle Expansion 1: Zoom Harder
 2018-09-17 11:14:54 -07:00
Mechoid
4fb5455fd3 Makes Blobs more useful. 2018-09-16 22:12:17 -07:00
Anewbe
17a5010f44 Signal pistol can be reloaded (#5566) 2018-09-16 17:23:39 -07:00
Anewbe
c12d7e25b0 Readds size traits 2018-09-13 17:22:11 -05:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00
Mechoid
426d4b45f3 The cybersuit is now a space suit. 2018-09-11 19:59:00 -07:00
Mechoid
0651206a51 Refactor cargo trains, they're just normal trains now. Adds the Quad, and re-enables/fixes the Space Bike! 2018-09-08 23:05:08 -07:00
Atermonera
40a8a9ba15 Merge pull request #5550 from Anewbe/helmet_hair 
Helmets now show only certain hairstyles
 2018-09-08 11:02:20 -07:00
Cerebulon
d2cf9c7203 Adds new set of cyborg sprites for medical/science/default/security/combat (#5546) 2018-09-08 11:01:35 -07:00
Atermonera
953221d5b0 Merge pull request #5514 from TravellingMerchant/master 
Removes Shellguard Noble cyborg sprites.
 2018-09-06 17:52:00 -07:00
Anewbe
b109cfae42 Helmets now show only certain hairstyles 2018-09-05 19:43:24 -05:00
Neerti
a30a235de5 Merge pull request #5545 from Anewbe/another_boxfort_falls 
Buffs the Vox
 2018-09-05 15:55:29 -04:00
Poojawa
6b403022a7 Ports /vg/ instrument frame work, adds client based sound pref 
Also shifts sound files which is 98% of the bulk here.
 2018-09-05 03:35:34 -05:00
Anewbe
4cebe1cfb9 Merge pull request #5541 from Atermonera/rotate_submap 
Submaps can be rotated
 2018-09-04 22:41:19 -05:00
Anewbe
8c5562b4bc Fixes some bugs tangentially related to Vox code 2018-09-04 21:36:12 -05:00
atermonera
7f5c747d79 Removes debug code (Yes, I'm an idiot) 2018-09-01 01:28:42 -07:00
Atermonera
d5de4651be Merge pull request #5539 from Anewbe/error_runtime 
Might fix the server startup error_handler runtime
 2018-08-31 22:56:52 -07:00
Anewbe
08ddd217a8 Buffs the Vox 2018-08-31 22:58:25 -05:00
Anewbe
f2ac530c24 Merge pull request #5540 from Mechoid/Fix_Girders 
Cult Girders are back to being proper.
 2018-08-31 22:04:45 -05:00
Atermonera
490d49e10a Merge pull request #5536 from Mechoid/Fix_Shield_Drones 
Shield Drone no longer auto-fails with Energy Relays.
 2018-08-31 15:57:32 -07:00
Atermonera
a5fdbb6458 Merge pull request #5526 from Anewbe/throwing 
Catching is no longer guaranteed, accuracy code is more general
 2018-08-31 01:39:58 -07:00
atermonera
2f9cebd38d Submaps can now be rotated to any cardinal direction (South is default) 2018-08-31 01:32:26 -07:00
Mechoid
69ad0ce12b Cult Girders are back to being proper. 2018-08-30 22:21:21 -07:00
Anewbe
f79a0cb9a6 Merge pull request #5527 from Mechoid/Neural_Implant 
Adds a Neural implant for future implementation.
 2018-08-30 23:23:32 -05:00
Anewbe
3c8313650f Might fix the server startup error_handler runtime 2018-08-30 22:59:15 -05:00
atermonera
a20085ccff PoIs can be rotated in increments of 90 degrees 2018-08-30 18:55:22 -07:00
Mechoid
98678489fd Shield Drone no longer auto-fails with Energy Relays. 2018-08-30 12:44:04 -07:00
Mechoid
7abeee54a0 Cult heal modifier no longer does Shit-Tons of agony. Does mediocre agony on non-cultists. 2018-08-28 21:40:41 -07:00
Mechoid
31761714b2 Adds a Neural implant for future implementation. Promethean brains have been updated to fit it. 2018-08-28 01:23:36 -07:00
Anewbe
b5e9000e11 Catching is no longer guaranteed, accuracy code is more general 2018-08-27 22:37:53 -05:00
Anewbe
9d8a19ab5d Cleave changes, attack code cleanup 2018-08-27 01:18:49 -05:00
Anewbe
532012c5bf Merge pull request #5520 from Mechoid/No_Freezing_Beer 
Iced beer no longer drops you to 3 degrees centigrade.
 2018-08-26 12:48:43 -05:00
Anewbe
abe2f2c26a Merge pull request #5519 from Mechoid/Mech_Equipment_Carepackage1 
Mech Equipment Carepackage 1: Mainly Weapon Slots
 2018-08-26 12:48:32 -05:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Mechoid
5ec1fea6b8 Iced beer no longer freezes you to 3 degrees C, which is enough to seriously burn a Skrell. Seriously, that's weird. 2018-08-25 14:06:19 -07:00
Mechoid
bbeb578a7e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1 
# Fix Conflicts:
#	code/game/objects/items/weapons/grenades/explosive.dm
 2018-08-24 16:05:35 -07:00
Atermonera
f776cc0513 Merge pull request #5517 from Anewbe/hud_invis 
Low alpha now makes HUDs and tooltips not show up on you
 2018-08-24 15:47:22 -07:00
Atermonera
422bd2545c Merge pull request #5516 from Anewbe/fragmentation 
Adds a new subset of grenades that shoot projectiles
 2018-08-24 15:47:01 -07:00
Atermonera
0a63e67785 Merge pull request #5508 from Anewbe/robobrain_meathead_fix 
Fixes the bug(s) that allow meat bodies to have metal brains
 2018-08-24 15:00:29 -07:00
Atermonera
1cfefcf2ec Merge pull request #5501 from Anewbe/magazine_things 
Adds smart magazine, magazine functionality
 2018-08-24 14:35:55 -07:00
Mechoid
be703cee04 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1 2018-08-23 20:17:49 -07:00