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
31,280 Commits 10 Branches 0 Tags
334f24730e978430d4850b1a2cef8c74f4180fa5
Commit Graph

14344 Commits

Author SHA1 Message Date
Neerti
334f24730e Merge pull request #2124 from Yoshax/hair 
Adds a new hairstyle
 2016-07-13 14:41:46 -04:00
Neerti
f2e0462dcb Merge pull request #2123 from Yoshax/languages 
Makes languages great again
 2016-07-13 14:38:33 -04:00
Yoshax
f2f6ca54f2 Adds a new hairstyle 2016-07-13 18:34:46 +01:00
Yoshax
402e046576 Fixes languages not being properly added to mobs 2016-07-13 18:12:15 +01:00
Yoshax
cda6508001 Merge pull request #2119 from Anewbe/burning_bodies 
Burning bodies no longer burn forever
 2016-07-13 17:13:16 +01:00
Yoshax
3df18c2870 Merge pull request #2111 from Serithi/LAVENDER_UNBORKIFICATION 
Properly alphabetizes lavender in the vending machines.
 2016-07-13 17:10:10 +01:00
Anewbe
811a7be362 fire_stacks decrease over time 2016-07-12 21:27:04 -05:00
woodratt
47ab279b9b 1.5.5 Fancy Green Uniforms 
- Adds, one green suit and formal jacket.
- One new military like jacket that can be selected from the loadout.
- A new holster type, leg holster. Can be selected from the loadout as well.
- Cleaned up a couple of the sprites for outfits that have ties (rolled up sleeve versions on a couple still had the tie sprite).
 2016-07-12 17:19:39 -07:00
Serithi
8ad6f5e626 Properly alphabetizes lavender in the vending machines. 2016-07-11 20:16:56 -07:00
Yoshax
d4e8589d8f Ports Mloc's HUD fixes from Bay and further fixes ours because of code differences 2016-07-11 16:35:21 +01:00
Neerti
8307cff728 Merge pull request #2106 from Yoshax/ammo_states 
Add more states to 10mm mag sprites
 2016-07-11 04:07:52 -04:00
Neerti
f9cfdebb45 Merge pull request #2105 from Yoshax/spookyghosts 
Refactors wipe_core(), extends function to pAIs
 2016-07-11 04:07:44 -04:00
Neerti
4a06606acc Merge pull request #2102 from Anewbe/paralyze 
Creates a prompt on unparalyze
 2016-07-11 04:05:18 -04:00
Daranz
c0bfd668bb Rename '12mm' to '10mm' in sprites 
Round is already referred to as '10mm' everywhere else.
 2016-07-11 05:22:23 +01:00
Kasuobes
0471e7e0c4 Refactors silicon job slot/tater cleanup (#1) 
* Refactors silicon job slot/tater cleanup

Moved from ai/verb/wipe core to silicon/proc.

* Adds wipe_software verb for pAI

Let pAI ghost properly, calls silicon/proc/clear_client()

* Refactors silicon job slot/tater cleanup
 2016-07-11 05:17:30 +01:00
Kasuobes
fabdf3d782 Adds delete_personality verb for pAI 
Ported over from AI's wipe_core verb, allow pAIs to ghost and leave the round properly in case nobody wipes the pAI device.
 2016-07-11 05:13:30 +01:00
mwerezak
108a748d1f Fixes pepperspray making sounds even when the safety is on 2016-07-11 04:54:40 +01:00
Anewbe
2978f5093b Creates a prompt on unparalyze 2016-07-10 20:58:08 -05:00
EmperorJon
64edc40839 Merge pull request #2090 from Neerti/7/10/2016_limb_hud_bay_port 
New Limb HUD System, from Bay
 2016-07-10 13:26:25 +01:00
EmperorJon
cc869bdb68 Merge pull request #2096 from Neerti/7/10/2016_mining_booms 
Explosive Mining!
 2016-07-10 13:26:19 +01:00
Neerti
d8635e4632 Removes world << debug. 2016-07-10 08:16:59 -04:00
Neerti
3a308cc8db Merge pull request #2095 from Anewbe/wardem 
Corrects a "Wardem" misspelling
 2016-07-10 08:09:46 -04:00
Neerti
38b564ee5b Explosive Mining! 
Explosions can now expose ore from underneath asteroid turf, so now Toxins has an actual use besides griefing.  The amount of ore you get depends on the same circumstances as drilling down, however explosions tend to cause some loss in minerals obtained.  Hopefully the vastly faster method of exploding the asteroid instantly will prove to be viable.
 2016-07-10 08:06:56 -04:00
Anewbe
0396675865 Corrects a "Wardem" reference 2016-07-10 07:01:31 -05:00
Neerti
814f59cf29 New Limb HUD System, from Bay 
Manually ports https://github.com/Baystation12/Baystation12/pull/13530, and https://github.com/Baystation12/Baystation12/pull/13561 from bay.
Adjusts the scaling on the coloration, since it seems Bay has different shading than us for species, otherwise some species would be dark, and others would be superbright.
Credit goes to Zuhayr for the code.
 2016-07-10 06:22:44 -04:00
EmperorJon
32129232b7 Merge pull request #2086 from Neerti/7/10/2016_freezer_fixes 
Freezer Fixes
 2016-07-10 10:56:59 +01:00
Neerti
25c580d470 Merge pull request #2083 from Yoshax/preview 
Can now toggle loadout and job preview equipment separately.
 2016-07-10 03:03:29 -04:00
Neerti
a62fea9c83 Merge pull request #2079 from Yoshax/solarstorm 
Adds the Solar Storm event
 2016-07-10 03:03:19 -04:00
Neerti
1a2a9c5990 Merge pull request #2078 from Yoshax/friendsforever 
Allows runtime to become friends with anyone
 2016-07-10 03:03:13 -04:00
Neerti
3841290fc8 Merge pull request #2076 from Yoshax/cargo 
Adds more fifty stacks and corrects cargo
 2016-07-10 03:03:00 -04:00
Neerti
e9dd848cf1 Freezer Fixes 
Freezer crates, freezer boxes, cryobags, and medical grippers now properly preserve organs, as well as organs attached to organs.
Cleans up storage.dm slightly by removing loc setting with forceMove(), for the above to work.
 2016-07-10 03:00:25 -04:00
SinTwo
0bb5058a6a Merge pull request #2084 from Neerti/7/9/2016_ninja_fix 
Ninja Powersink Fix
 2016-07-10 00:35:33 -04:00
Neerti
3a298d1df0 Merge pull request #2081 from Yoshax/cheaperbots 
Adjusts FBP and prosthetic limb producing costs
 2016-07-10 00:12:50 -04:00
Neerti
d9504d82a6 Merge pull request #2080 from Yoshax/grippers 
Added a chemistry gripper for crisis borgs
 2016-07-10 00:12:37 -04:00
Neerti
19936ce06c Ninja Powersink Fix 
Fixes ninja powersinks not working, and likely some other bugs involving rig gloves, like handcuffing.
 2016-07-10 00:03:21 -04:00
PsiOmegaDelta
d405dfb102 Can now toggle loadout and job preview equipment separately. 2016-07-10 04:53:49 +01:00
Yoshax
af46ead9fd Fully removes floor-length braid instead of leaving it as a stupid meme 2016-07-10 04:42:19 +01:00
Yoshax
946f0a1d1b Adjusts FBP and prosthetic limb producing costs 2016-07-10 04:37:00 +01:00
BlueNexus
9cdbae9c37 Added a bottle-gripper 
Rename

To squash
 2016-07-10 04:24:25 +01:00
Yoshax
546b59f648 Polaris fix 2016-07-10 04:15:32 +01:00
Techhead0
111310ef32 Adds the Solar Storm event. 
New Random Event: Solar Storms. Similar to a radiation storm, but anywhere inside the station is safe.
Also boosts solar panel output significantly for the duration.
 2016-07-10 04:15:23 +01:00
mwerezak
98a9171ba8 Allows runtime to become friends with anyone 
Also tweaks behaviour slightly
 2016-07-10 04:07:30 +01:00
Yoshax
66a27846e7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cargo 2016-07-10 03:49:46 +01:00
Yoshax
e28c4361f7 Merge pull request #2015 from Neerti/12/16/2015_newwizard 
Dry-dock phase for Technomancer
 2016-07-10 03:43:35 +01:00
Yoshax
c60407e6f4 Adds fifty stacks for all material stacks and makes drop pod actually drop fifties 2016-07-10 03:40:24 +01:00
PsiOmegaDelta
60593ce024 Bay-tweaks. 
Ultra dynamic MedHUD states.
 2016-07-10 03:14:22 +01:00
Yoshax
cf09435293 Adds material stack variants with base 50 amount for adminspawn etc 2016-07-09 04:04:40 +01:00
Neerti
61e291a083 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 12/16/2015_newwizard 2016-07-08 21:00:12 -04:00
Neerti
8a61641479 Some more work + prep for drydocking. 2016-07-08 20:38:34 -04:00
Yoshax
d24afd78d2 Merge pull request #2065 from redstryker/Flannels 
Adds Flannels
 2016-07-09 01:10:01 +01:00