cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-28 06:26:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
45,773 Commits 66 Branches 25 Tags
TravisFix
Commit Graph
1807 Commits
Author SHA1 Message Date
Anewbe 3f2d996f7d Improves Halloween costumes, tweaks the admin verb for equipping 2017-10-20 16:01:09 -05:00
Neerti 9c0ac5ec2a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/20/2017_syndie_borgs_are_back 2017-10-20 13:26:06 -04:00
Neerti 1aff3fc8c0 Syndicate Borgs II, Return of the Salt 
Adds an option in mercenary uplinks to purchase three different 'classes' of drones.
See PR for more details.
 2017-10-20 13:01:45 -04:00
mistyLuminescenceandAnewbe b99b8a025f New halloween outfit + pirate outfit fix (#4106) 
* spooky

* whitoeut?? what's that
 2017-10-20 01:27:52 -05:00
MechoidandAnewbe 920e823a46 Fuel-Rod Gun, Minor fixes related. (#4103) 
* A whole load of things.

* Fixes the SM Rod's travel distance.
 2017-10-19 15:07:52 -05:00
mistyLuminescenceandAnewbe 799a51ec60 Adds expensive antag crate to Cargo (#4086) 
* Adds expensive antag crate to Cargo

* Fixing code bugs

* thanks travis

* travis why

* aaaa.

* AAAAAAAAAA

* RIG crate removed per request
 2017-10-17 20:13:00 -05:00
killer653 1bb71ef429 Polaris Sync 2017-10-16 22:16:24 -04:00
NeertiandGitHub d42edb679b Merge pull request #4069 from Anewbe/costumes 
Halloween Costume Outfits
 2017-10-16 19:01:25 -04:00
mistyLuminescenceandAnewbe f87a6d7d8c Adds a white robe. (#4074) 
* - Adds a hooded robe themed after the Rishizirr, the mythological Tajaran angels of death said to shepherd the souls of those who die while snowed in to their designated afterlife. Perfect for Hallowe'en!

* Adds a hooded white robe.

* Fixes the white robe.

* Fixes the robe, again
 2017-10-16 04:27:03 -05:00
Anewbe bb6efa131d Merge branch 'master' of https://github.com/PolarisSS13/Polaris into costumes 2017-10-14 02:19:29 -05:00
Anewbe 0741b45570 Adds costumes, improves admin outfit verb 2017-10-14 02:19:13 -05:00
Anewbe f57fe381f8 Minor outfit tweaks 2017-10-13 10:41:08 -05:00
NeertiandAnewbe a8513844ec Adds a Trait system (#4048) 
* Works on trait system, wip.

* Finalizes traits.
Fixes a few bugs with medical machines assuming a max health of 100.
 2017-10-13 01:17:39 -05:00
Anewbe cf6b558be8 Corrects security ids 2017-10-12 17:44:51 -05:00
Anewbe 069adbb538 Ids should have accounts now 2017-10-12 17:01:20 -05:00
Cameron Lennox e650c62c6b LOTS OF FIXES 2017-10-08 18:05:27 -04:00
Cameron Lennox 15a6472d14 Pol Sync 2017-10-08 17:44:25 -04:00
Anewbe 152cf3362c Finishing touches on outfit code 2017-10-04 21:55:55 -05:00
Anewbe 10b0264c6a Yet more work on the Outfit System 2017-10-04 20:05:20 -05:00
Anewbe cf9245b5fb More work on outfits 2017-10-04 11:49:24 -05:00
Anewbe 094df467a9 Continues work on Outfits 2017-10-04 01:14:09 -05:00
Anewbe 2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00
NeertiandGitHub cf263e348e Merge pull request #3981 from Anewbe/gravetender 
Adds the gravekeeper lost borg module
 2017-10-03 23:01:15 -04:00
SpadesandGitHub 54d4069eff Merge pull request #2195 from Verkister/returnofthelongpup 
Re-enables and fixes the CARGO EXCLUSIVE oties. Plus a couple new features! (Psst hey)
 2017-10-03 22:31:24 -04:00
Anewbe d0a22df9c3 Continues work on outfits 2017-10-01 20:50:30 -05:00
Anewbe 1b7ecf6789 Ports Bay's outfit system 2017-10-01 02:31:37 -05:00
Anewbe d067f70403 Adds the thing that spawns the gravekeeper drone 2017-09-30 02:00:10 -05:00
Anewbe efa89a9650 Splits the robot_modules file. Continues work on gravekeeper drone. 2017-09-29 01:02:53 -05:00
Anewbe 20c5e31c3b Adds the gravekeeper lost borg module 2017-09-28 22:21:09 -05:00
killer653 3f882d6702 Adds riding crop 2017-09-27 23:27:17 -04:00
Anewbe 47f2854bb7 Makes the scythe a child of fireaxes, adds it to the weed control crate 2017-09-26 22:15:33 -05:00
Verkister bc5b5e7b44 Brings back some slightly tweaked individual oties. 
-With the lack of any in-depth borkage documentation, I felt like staying with my earlier point of the big issues being likely caused by vast numbers of these feature heavy snowflake mobs being spawned for wilderness cannonfodder en masse, which the current wildernessless build would rule out for better troubleshooting.
-People had been missing these in IC near my chars in multiple occasions recently and I didn't have the heart to tell em they were gone lmao.
-Only available via cargo orders now.
 2017-09-23 14:24:40 +03:00
AnewbeandGitHub c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone 
Adds the Lost Drone
 2017-09-22 15:24:05 -05:00
Neerti afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
killer653 2755d3ddb1 HOTFIX 2017-09-21 20:26:48 -04:00
BelsimaandAnewbe c67865ac63 Adds a load of new FBPs. (#3850) 
* Adds a load of new FBPs.

* Replaces cyber solutions sprites.

* Fixes and price adjustments.

* Revert "Fixes and price adjustments."

This reverts commit d56c3f082e9301b80970f62aa9d0cb3e8cfc6d8f.

* Fixes + supply price adjustments.

This time without... for some reason adding an empty line to the map
files. Not sure how that got caught by Git.

* Makes the new knockoffs into alternatives for the currently existing brands.

* new names
 2017-09-20 22:02:18 -05:00
Cyantime 52c3f014c1 Deconflicts2 2017-09-16 19:03:28 -04:00
Cyantime 68056dd5f2 Deconflict 2017-09-16 19:00:30 -04:00
SpadesandGitHub 1115d2d566 Merge pull request #2166 from Neopatra/Neopatra-Taursuits 
Neopatra's taursuits
 2017-09-16 18:56:45 -04:00
NeopatraandGitHub df1a318319 Adds taur suit to the rad suit crate 
I forgot to do this. I have no longer forgotten as it is here.
 2017-09-16 17:19:17 -04:00
NeopatraandGitHub db9b91354e Adds Taur Biosuits to Medical Biosuit Crate 
Also this crate is an absolute mess can we split it into like, 2 or 3 crates at a later date? Also aware that the general suit sprite isn't 100% correct, but I figured consistency was better until I finish all of the suits (They don't have different names in game so its not very noticeable).
 2017-09-16 13:13:03 -04:00
NeopatraandGitHub f9392153e5 Adds Taur Biosuit to Security Biosuit Crate 2017-09-16 13:07:36 -04:00
NeopatraandGitHub dbefe23039 Adds Taur Voidsuits to Relevant Supply Packs 2017-09-16 13:06:10 -04:00
killer653 bddfa16f82 Polaris sync 2017-09-15 21:17:34 -04:00
BelsimaandAnewbe fb0e4d3cf9 General uniform updates. (#3814) 
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
 2017-09-15 17:14:20 -05:00
Cyantime 965626656b Deconflicts 2017-09-15 15:27:12 -04:00
Cyantime 562d8539af Adds thermal regulators. 2017-09-15 15:23:26 -04:00
killer653 6297180aa5 Adds rahboopred sprites 2017-09-10 19:51:41 -04:00
Neerti 8f00965cc2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again 
# Conflicts fixed:
#	code/modules/admin/topic.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/view_variables/helpers.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/transform_procs.dm
#	maps/northern_star/polaris-1.dmm
#	polaris.dme
 2017-09-05 00:58:27 -04:00
Neerti 4bfcec55f2 work 2017-09-04 21:52:47 -04:00