cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,303 Commits 8 Branches 0 Tags
ff4be8c2e260c9157ebc876770184d3f103686f8
Commit Graph

1505 Commits

Author SHA1 Message Date
Anewbe
6dfea97220 Merge pull request #4166 from Neerti/10/26/2017_shields 
Adds New Advanced Shields, Tweaks
 2017-10-27 20:38:27 -05:00
Belsima
24a36295e3 Gives EMTs the appropriate EMT jacket. 2017-10-27 11:20:27 -04:00
Belsima
75b94df650 Gives T-Ray scanner to CE and Atmos. 2017-10-27 11:17:40 -04:00
Neerti
446927fa21 Adds New Advanced Shields, Tweaks 2017-10-26 20:55:13 -04:00
Neerti
2c8d0f5ac8 Merge pull request #4156 from Anewbe/outfit_tweaks 
Adjusts outfits again
 2017-10-26 19:56:43 -04:00
Anewbe
073fd9524c Adjusts outfits again 2017-10-25 02:24:15 -05:00
Anewbe
4e93d11919 Corrects the grenades in the ion weapon crates 2017-10-24 21:47:53 -05:00
Anewbe
6a52111680 Merge pull request #4116 from Neerti/10/20/2017_syndie_borgs_are_back 
Syndicate Borgs II, Return of the Salt
 2017-10-21 13:58:52 -05:00
Neerti
324afc55ba Update ghost_query.dm 2017-10-21 14:51:07 -04:00
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
mistyLuminescence
b99b8a025f New halloween outfit + pirate outfit fix (#4106) 
* spooky

* whitoeut?? what's that
 2017-10-20 01:27:52 -05:00
Mechoid
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
mistyLuminescence
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
Neerti
d42edb679b Merge pull request #4069 from Anewbe/costumes 
Halloween Costume Outfits
 2017-10-16 19:01:25 -04:00
mistyLuminescence
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
Neerti
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
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
Neerti
cf263e348e Merge pull request #3981 from Anewbe/gravetender 
Adds the gravekeeper lost borg module
 2017-10-03 23:01:15 -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
Anewbe
47f2854bb7 Makes the scythe a child of fireaxes, adds it to the weed control crate 2017-09-26 22:15:33 -05:00
Anewbe
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
Belsima
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
Belsima
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
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
Belsima
7665588e4e Adds a tiedye shirt. 2017-08-23 03:38:48 -04:00
MagmaRam
1546b25f4c Merge pull request #3698 from Belsima/fbps 
Adds Grayson Manufactories FBPs.
 2017-08-20 21:27:50 -06:00
Anewbe
676fb6daf6 Merge pull request #3694 from SpadesNeil/gun-stuff 
Gun stuff. Some fixes, some changes, and a shiny new SVD
 2017-08-20 11:21:50 -04:00
Neerti
e209c2c707 Merge pull request #3717 from Cyantime/cheaperteg 
Reduces TEG price.
 2017-08-17 11:52:29 -04:00
Cyantime
80ec86a07c Reduces TEG price. 2017-08-16 10:50:10 -04:00
Belsima
31f9127cf9 Adds Grayson Manufactories FBPs. 2017-08-10 14:38:33 -04:00
Spades
6b02206adf Sniper Changes and Fixes 
- Fixes the heavy sniper hand sprite so it no longer looks like a
pistol. Not ideal, but better.
- Changes energy sniper to use the Z8's hand sprite, because it's more
distinct than looking the same as the laser carbine.
- Adds the SVD back by request of Woodrat. It's not spawnable yet, since
I don't know where you want to balance it.
 2017-08-09 21:04:58 -04:00
Neerti
01856579d1 Merge pull request #3681 from LorenLuke/Antag-fix 
Allows team traitor and autotraitor to order AM rifle.
 2017-08-05 19:39:31 -04:00
LorenLuke
f3b2ddd80c Fixes typo. 2017-08-05 15:28:42 -07:00