cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,251 Commits 5 Branches 0 Tags
b91556565517cfa948fff5ca038a1c25d454042f
Commit Graph

26381 Commits

Author SHA1 Message Date
Anewbe
b915565655 Merge pull request #4145 from MisterLayne/GimmeDemMaterials_BORG 
Ends organic bias.
 2017-10-24 11:38:11 -05:00
Ansari
169f2c0e0a Cloning machine now auto process meat (#4137) 
* Cloning machine now auto process meat(And meatball and meatpie and meatsteak)

* Prevent chatspam

* Format text
 2017-10-23 19:34:26 -05:00
Neerti
ca84cd326a Merge pull request #4139 from Anewbe/nicknames 
Adds the ability to choose nicknames
 2017-10-23 13:37:34 -04:00
Anewbe
5edf4c30c7 Merge pull request #4141 from ForFoxSake/master 
Small Window Damage Tweak
 2017-10-23 10:56:45 -05:00
Anewbe
f079a97278 Merge pull request #4146 from Screemonster/shieldfix 
fixes exterior shields putting shields EVERYWHERE
 2017-10-23 10:49:51 -05:00
Neerti
bdbbab4650 Merge pull request #4133 from Anewbe/firestorm 
Rebalances Firestorm
 2017-10-23 02:44:51 -04:00
Anewbe
d48795b917 Merge pull request #4134 from Cameron653/patch-1 
Removes duplicate internal organs
 2017-10-23 00:44:04 -05:00
Neerti
939eb042f2 Merge pull request #4144 from Anewbe/botanists 
Botanists should show up in the proper part of the manifest
 2017-10-23 00:38:50 -04:00
Screemonster
52f789a75b fixes exterior shields putting shields EVERYWHERE 2017-10-23 04:26:44 +01:00
MisterLayne
ce9181877e Gives engineering robos some nice new materials. 2017-10-22 23:10:02 -04:00
Mechoid
6f27d2ae7e Merge pull request #4115 from Anewbe/modular_armor 
Steals Bays modular armor, for later use
 2017-10-22 17:55:25 -07:00
Mechoid
9e8c4b07ff Merge pull request #4121 from Anewbe/bring_back_sneak 
Makes footsteps less common on walk intent
 2017-10-22 17:46:38 -07:00
Anewbe
9295a9813e Adds the Promethean loreblurb 2017-10-22 19:14:34 -05:00
Anewbe
f1975c5f18 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vatborn 2017-10-22 19:06:09 -05:00
Anewbe
7a36a8cfb6 Merge pull request #4118 from mistyLuminescence/cryostorage 
Reworks cryopod storage
 2017-10-22 19:03:07 -05:00
Anewbe
6774a1b5f2 Merge pull request #4129 from Belsima/centcolor 
Recolors some CentComm items to use NT colors.
 2017-10-22 18:55:21 -05:00
Anewbe
94306a9947 Botanists should show up in the proper part of the manifest 2017-10-22 18:52:18 -05:00
Anewbe
6fe70cd0a3 Merge pull request #4122 from MisterLayne/emotes4dayz 
More emotes!
 2017-10-22 14:52:07 -05:00
ForFoxSake
d7c9eef7e1 Makes windows less invulnerable. 2017-10-22 13:26:39 +01:00
Anewbe
28c9c12837 Adds the ability to choose nicknames 2017-10-22 00:56:46 -05:00
Neerti
25e31a7480 Merge pull request #4136 from Anewbe/ahelp_bugfixes 
Hopefully fixes ahelps
 2017-10-22 01:31:15 -04:00
Anewbe
6543723c6e Merge pull request #4124 from Belsima/giantmobs 
Fixes giant mobs and adds more.
 2017-10-22 00:26:58 -05:00
Mechoid
48d8375cac Incendiary >= 2 projectile fixes. (#4127) 
* A whole load of things.

* Fixes the SM Rod's travel distance.

* Flame it again, Tony. Fixes flamefuel spawning on rock-wall turf.
 2017-10-22 00:26:33 -05:00
Anewbe
7963f539db Hopefully fixes ahelps 2017-10-21 23:27:24 -05:00
Cameron653
af4d6d7368 Clears out the rest of them and leaves comments. 
Of where to find them.
 2017-10-21 15:38:19 -04:00
Cameron653
eb6238f613 Removes duplicate heart 
https://github.com/PolarisSS13/Polaris/blob/master/code/modules/organs/internal/heart.dm
 2017-10-21 15:24:08 -04: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
Anewbe
a0ed4365f0 Rebalances Firestorm 2017-10-21 13:58:19 -05:00
Neerti
324afc55ba Update ghost_query.dm 2017-10-21 14:51:07 -04:00
Neerti
c1f971a1e2 Merge pull request #4120 from Anewbe/costume_tweaks 
Improves Halloween costumes, tweaks the admin verb for equipping
 2017-10-21 14:29:52 -04:00
MisterLayne
b7dcac5057 Adds more emotes. 2017-10-21 11:11:00 -04:00
Neerti
aa9231d0fa Update syndicate.dm 2017-10-21 11:02:05 -04:00
Neerti
083369c614 Update borghydro.dm 2017-10-21 10:42:53 -04:00
Belsima
8363f34044 Recolors some CentComm items to use NT colors. 2017-10-21 09:21:20 -04:00
Belsima
5dcd04cfe8 Adjusts giant mobs. 2017-10-20 20:02:42 -04:00
Mechoid
d0d7f17b08 Allows the Flamethrower and Fireaxe to be held in the firebug suit's storage. 2017-10-20 14:44:32 -07:00
Anewbe
4034a0aaa7 Makes footsteps less common on walk intent 2017-10-20 16:13:46 -05:00
Anewbe
3f2d996f7d Improves Halloween costumes, tweaks the admin verb for equipping 2017-10-20 16:01:09 -05:00
Mechoid
1770d1ef76 Adds the Mercenary Fire-fighter suit. 2017-10-20 12:43:19 -07:00
Neerti
12ae485e48 Merge pull request #4117 from Anewbe/glass_bugfix 
Should be able to transfer reagents between glasses again
 2017-10-20 15:18:10 -04:00
Neerti
05f83497fd Merge pull request #4105 from Anewbe/event_manager 
Does work on the event manager role again
 2017-10-20 15:16:50 -04:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01:00
Anewbe
52cbe08c76 Should be able to transfer reagents between glasses again 2017-10-20 12:56:07 -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
Anewbe
9135341847 Steals Bays modular armor, for later use 2017-10-19 23:32:33 -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
Mechoid
8939d21014 Stops MMIs created with a ghosted brain from being put into cyborgs. (#4110) 
* Stops MMIs created with a ghosted brain from being put into cyborgs.

* Fixes a typo and wording.
 2017-10-19 13:59:06 -05:00
Anewbe
04c393a953 Adds the Vatborn lore blurb, fixes some things. 2017-10-19 10:28:34 -05:00