cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,301 Commits 8 Branches 0 Tags
0c4e88ec321fdf38d3388f85af32f8412c30212d
Commit Graph

6489 Commits

Author SHA1 Message Date
Mechoid
ec9dded0cc Merge pull request #4151 from MisterLayne/LanguageModule 
Cyborg Language Module
 2017-10-27 10:24:07 -07:00
Neerti
2c8d0f5ac8 Merge pull request #4156 from Anewbe/outfit_tweaks 
Adjusts outfits again
 2017-10-26 19:56:43 -04:00
Anewbe
65eb398677 Fixes the access config issue 2017-10-26 17:34:15 -05:00
MisterLayne
436eaa1efb Adds language module. 2017-10-26 15:43:25 -04:00
Anewbe
073fd9524c Adjusts outfits again 2017-10-25 02:24:15 -05:00
Anewbe
5edf4c30c7 Merge pull request #4141 from ForFoxSake/master 
Small Window Damage Tweak
 2017-10-23 10:56:45 -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
ForFoxSake
d7c9eef7e1 Makes windows less invulnerable. 2017-10-22 13:26:39 +01:00
Belsima
8363f34044 Recolors some CentComm items to use NT colors. 2017-10-21 09:21:20 -04:00
mistyLuminescence
ae308a3a91 Reworks cryopod storage 2017-10-20 19:14:45 +01: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
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
mistyLuminescence
e76447a719 Loadout stuff, but done right! (#4094) 
* Loadout and accessory path tweaks.

* updated: armbands

* except it's better now

* no ian shirt and psych medHUD, travis fixed?

* OKAY ROUND THREE
 2017-10-19 09:36:15 -05:00
Anewbe
ef735ea89b Merge pull request #4098 from Neerti/10/15/2017_surface_stuff 
Touches Up the Surface Somewhat
 2017-10-19 09:36:03 -05:00
Neerti
95d93dae00 Touches Up the Surface Somewhat 
Changes the rock texture to hopefully be a bit better.  It's a recolored version of /tg/'s lavaland rock, and modified slightly to look less repetitive.
Ports the lavaland rock tile sprite entirely for future away missions.
Adds tree chopping down feature.  All trees now have health, and hitting it with things will reduce it.  Generally you need something sharp to have a chance of actually felling the tree.
Adds log material, which is obtained from chopping trees.  Hitting these with a sharp weapon converts them into two planks per log.  Can be used to build log walls but otherwise can't be used to craft, at the moment.
Ports /tg/ tree sprites.  Might have a use for them in away missions, who knows.
Makes crystals start anchored and glow.
Shoveling snow checks toolspeed now.
 2017-10-18 12:04:39 -04:00
Spades
edfa947278 These are not Vorestation edits. (#4088) 
Y'all are confusing the shit out of us.
 2017-10-16 23:01:30 -05:00
elgeonmb
36fa36586a fixed double periods when ghost-texting 2017-10-16 19:41:30 -07:00
Neerti
7b5f8bddd1 Merge pull request #4081 from Cameron653/512_FILTER_FIX 
BYOND 512 Compiling Errors Fix
 2017-10-16 18:47:47 -04:00
Anewbe
b14766ff92 Merge pull request #4078 from Mechoid/Projectile_Turretfunctions 
Turret Targetting Update
 2017-10-16 14:03:05 -05: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
killer653
fb8ba69ada Fixes all the other stuff 2017-10-15 20:56:13 -04:00
killer653
0080539924 More fixes 2017-10-15 19:54:50 -04:00
Mechoid
9a04744ab6 Turrets detect targets through metal foam. 2017-10-15 13:48:38 -07:00
Ansari
768dc2d7c0 Port over Chemistry bag from Paradise (#4067) 
* Add in chemistry bag from Paradise, based on /tg/ bag. Add it to biogenerator. Add it to wardrobe.

* Make itemsize large so it cannot be put in backpack. Slowdown = 1.
 2017-10-15 15:04:56 -05:00
Neerti
0a3d85647a Merge pull request #4011 from Anewbe/railgun 
Ports Bay's railguns, and assorted gun sprites
 2017-10-14 01:43:45 -04:00
Mechoid
56ec5ec94c Adds three flame-themed illegal Mech weapons and more. (#4058) 
* Adds three flame-themed illegal Mech weapons. Allows anything using apply_effects to be incendiary and ignite/apply firestacks. Also absolute-paths the spilled fuel effects.

* Removes world << because I'm a good coder honest.

* Why does Git do this for no reason.
 2017-10-13 23:32:52 -05:00
Belsima
e61efc752a more gammers (#4052) 
* Update medsci.dm

* Update miscellaneous.dm

* Update arcade.dm

* Update transform.dm

* Update implanter.dm

* Update shuttle_console.dm
 2017-10-13 23:32:22 -05:00
Anewbe
f9fd492caf Merge pull request #4060 from Neerti/10/13/2017_balling_out_of_control 
Adds the Ionic Rapier
 2017-10-13 23:31:38 -05:00
Anewbe
15ece5cd98 Merge pull request #4042 from MisterLayne/10/10/2017_AddsTRays 
Implements new T-Rays
 2017-10-13 09:49:28 -05:00
Neerti
0e57b66f6a Adds an Esword subtype that wrecks synthetics. 
Ports /tg/'s esword and double esword sprites, both item and inhands.
Hivebot isSynthetic() now returns true.
 2017-10-13 02:17:27 -04:00
Belsima
3069df74a4 Spelling + drone (#4050) 2017-10-12 11:14:46 -05:00
Neerti
7cafd7d239 Merge pull request #4002 from Anewbe/outfits 
Ports Bay's outfit system
 2017-10-11 22:00:45 -04:00
MisterLayne
392aa1d8bc Makes the new T-Ray Scanners available 2017-10-11 17:11:49 -04:00
Neerti
d848197534 Merge pull request #4029 from Anewbe/skeletons 
Adds Skeletons for background use
 2017-10-11 14:48:41 -04:00
Neerti
1f0bb5891c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/28/2017_web_shuttles 
# Conflicts resolved:
#	code/modules/busy_space/organizations.dm
 2017-10-10 01:19:53 -04:00
Neerti
7225ea2b66 Read github PR for details. 2017-10-10 00:48:27 -04:00
Neerti
b4a1e16132 Merge pull request #4027 from Anewbe/landmark_fixes 
Landmark fixes
 2017-10-09 03:41:47 -04:00
Anewbe
ff7c4fe45a Makes a bunch of things fit in holsters 2017-10-07 17:24:18 -05:00
Anewbe
1f9a14ffd7 Adds Skeletons for background use 2017-10-06 20:40:12 -05:00
Anewbe
ccd90031fa Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci 
Science Dufflebag
 2017-10-06 10:51:05 -05:00
Anewbe
098bb66e4a Makes landmarks invisible, mobcorpse landmark actually despawns 2017-10-05 21:44:26 -05:00
MisterLayne
8aed98be14 Adds science dufflebag 2017-10-05 16:26:56 -04:00
Anewbe
66837464d2 Implanters should have an icon again 2017-10-04 23:07:59 -05:00
Anewbe
82f24079f4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 
# Conflicts:
#	code/game/jobs/job/assistant.dm
#	code/game/jobs/job/civilian.dm
#	code/modules/admin/admin_verbs.dm
 2017-10-04 20:08:55 -05:00
Anewbe
10b0264c6a Yet more work on the Outfit System 2017-10-04 20:05:20 -05:00
Neerti
4db89d42f5 Merge pull request #4014 from Anewbe/drone_permits 
Drone permits can now be worn
 2017-10-04 20:59:29 -04:00
Anewbe
2fde466a21 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into outfits 2017-10-03 23:24:12 -05:00