cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 05:02:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,566 Commits 6 Branches 0 Tags
01f33216d2473b7b058f9c076bd64c634b51e9d7
Commit Graph

25840 Commits

Author SHA1 Message Date
Anewbe
01f33216d2 Merge pull request #3759 from SpadesNeil/removes-unused-things 
Fixes "Death Commando" mask, changes its name
 2017-09-01 22:01:43 -04:00
Spades
5bbf24a386 Fixes "Death Commando" mask, changes its name 
No use letting unused assets go to waste.

At first I thought this was a redundant mask but it actually serves a
use, it's just coded wrongly.
 2017-09-01 20:09:31 -04:00
Spades
9b7ccae9c9 Fixes Colt pistol not switching icons when empty. 
The "Detective" pistol worked fine but the base Colt did not. This fixes
both.
 2017-09-01 03:11:12 -04:00
Anewbe
0d607488b3 Merge pull request #3737 from Nalarac/PTools 
Adds More Ways to Obtain Power Tools
 2017-08-29 17:28:25 -04:00
Mechoid
1ddad57245 Fixes 'The data cable retracts rapidly into its spool.' times a billion. 2017-08-28 20:12:26 -07:00
Anewbe
0c89df05f6 Should make prometheans playable 2017-08-27 14:24:47 -05:00
Anewbe
e365fc5a3f Merge pull request #3726 from Woodratt/WR_Floortile_stuff 
Woodrat breaks everything with floor decals
 2017-08-27 15:13:20 -04:00
Neerti
b80e2ff9bc Merge pull request #3736 from MisterLayne/8/25/2017_fixes_solar_computer 
~Solar Computer Fix~
 2017-08-27 01:32:56 -04:00
MagmaRam
e370d56656 Merge pull request #3710 from SpadesNeil/window-change 
Weak attacks no longer can damage windows
 2017-08-26 13:55:36 -06:00
MagmaRam
3c99907484 Merge pull request #3733 from Belsima/tiedye 
Adds a tiedye shirt.
 2017-08-25 19:46:56 -06:00
Andrew
4c133ba95d Adds More Ways to Obtain Power Tools 
- Added the hand drill and jaws of life to the protolathe
- Removed titanium from the hand drill and jaws of life
- Syndicate toolbox now comes with power tools
 2017-08-25 20:15:09 -05:00
MisterLayne
0a232698b1 Fixes the problem with the solar control computers where they were not fixable if they were destroyed and the glass was removed. 2017-08-25 16:42:57 -04:00
Neerti
289ebba13e Merge pull request #3730 from Belsima/click 
Adds more click sounds to the game.
 2017-08-24 17:34:22 -04:00
MagmaRam
a99cf12243 Merge pull request #3729 from Belsima/master 
Adds Teshari sneezing sounds.
 2017-08-24 05:06:52 -06:00
Belsima
7665588e4e Adds a tiedye shirt. 2017-08-23 03:38:48 -04:00
Belsima
5268f21321 Adds more click sounds to the game. 2017-08-23 03:16:21 -04:00
Belsima
a11bc0b9db Adds Teshari sneezing noises. 2017-08-23 03:08:10 -04:00
Neerti
f5f298483a Merge pull request #3725 from MagmaRam/tesla_relay 
Tesla relays will no longer draw power from the local APC when their …
 2017-08-22 17:50:34 -04:00
Anewbe
4745ce0aa4 Merge pull request #3706 from SpadesNeil/removes-hardsuit-lettering 
Removes hardsuit descriptions that name the station.
 2017-08-22 17:17:25 -04:00
MagmaRam
3dae4b1a75 Merge pull request #3715 from Belsima/readyup 
Replaces status frame sprite.
 2017-08-21 18:47:37 -06:00
Woodratt
10c8586db0 Rough port of 
a8c9bb786a

Unsure if I even did it correctly, but seems to function in the brief tests done, no compile errors.

In preparation of porting the massive number of floor decals for the new map.
 2017-08-21 14:44:25 -07:00
MagmaRam
499f29354a Merge pull request #3716 from Belsima/zipper 
MORE ZIPPOS
 2017-08-21 13:27:12 -06:00
MagmaRam
1546b25f4c Merge pull request #3698 from Belsima/fbps 
Adds Grayson Manufactories FBPs.
 2017-08-20 21:27:50 -06:00
MagmaRam
a3a003fe5b Tesla relays will no longer draw power from the local APC when their device's cell is full. 2017-08-20 17:38:39 -05: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
Cyantime
42ac4a8e27 Removes debug message from list pin. 2017-08-17 18:24:20 -04:00
Cyantime
05e9eb7598 Removes debug messages from color pin. 2017-08-17 18:22:12 -04:00
Neerti
a08f93481f Merge pull request #3713 from Belsima/batterup 
Adds positronic bootup noises.
 2017-08-17 12:01:43 -04:00
Neerti
ea353410d3 Merge pull request #3719 from Cyantime/simplemobiconorder 
Fixes dead simple mobs keeping their resting icon.
 2017-08-17 11:59:53 -04:00
Neerti
ca2ee612d8 Merge pull request #3687 from SpadesNeil/stop-making-devs-cry 
Changes /turf/space/transit icons in map editor
 2017-08-17 11:59:17 -04:00
Neerti
8e8b666b46 Merge pull request #3712 from Belsima/biogen 
Adds more items to the biogenerator.
 2017-08-17 11:58:22 -04:00
Neerti
dc2e629b50 Merge pull request #3718 from Cyantime/mouses 
Safer vent selection for spawned mice.
 2017-08-17 11:57:57 -04:00
Neerti
84756af1a2 Merge pull request #3720 from Cyantime/freezercapupgrade 
Fixes upgrading capacitors in unary freezers doing nothing.
 2017-08-17 11:53:05 -04:00
Neerti
e209c2c707 Merge pull request #3717 from Cyantime/cheaperteg 
Reduces TEG price.
 2017-08-17 11:52:29 -04:00
Anewbe
3650fb1562 Merge pull request #3699 from Belsima/master 
A load of Teshari stuff: For Real This Time
 2017-08-16 22:53:00 -04:00
Cyantime
aaef8163be Fixes upgrading capacitors in unary freezers doing nothing. 2017-08-16 17:34:13 -04:00
Cyantime
6958306b60 Gives dead icon priority over resting icon. 2017-08-16 17:09:34 -04:00
Cyantime
abc826320e Safer vent selection for spawned mice. 2017-08-16 16:57:18 -04:00
Cyantime
80ec86a07c Reduces TEG price. 2017-08-16 10:50:10 -04:00
Belsima
efac0c7e7b fuck i didnt even code the zippos in 2017-08-15 23:59:14 -04:00
Belsima
87f98d3b24 Replaces status frame sprite. 2017-08-15 23:49:34 -04:00
Belsima
fcb471af20 Adds positronic bootup noises. 2017-08-15 23:03:35 -04:00
Belsima
dc3b04b3ce Adds more items to the biogenerator. 2017-08-15 22:54:23 -04:00
Anewbe
7d7bc4cde6 Merge pull request #3705 from Cameron653/master 
Modifies 1 time PAI sprite&speech selection.
 2017-08-15 18:31:20 -04:00
Belsima
8295742f81 More monitors! 2017-08-15 15:02:35 -04:00
Spades
8bbd131899 Better spot to do this in 2017-08-14 23:25:53 -04:00
Anewbe
ad4b439e96 Merge pull request #3680 from Neerti/8/4/2017_arrivals 
Makes Arrivals Shuttle Great
 2017-08-14 21:59:18 -04:00
Anewbe
d55f8b64d5 Merge pull request #3692 from PrismaticGynoid/wheelchairs 
Better Wheelchairs
 2017-08-14 21:57:27 -04:00
Neerti
0210414388 Changes some arrival messages so traitors buying fake records fit with the new shuttle arrival message. 2017-08-14 21:46:27 -04:00
Anewbe
19476a81cd Merge pull request #3688 from SpadesNeil/assault-carbine 
Assault rifle tweaks and fixes
 2017-08-14 21:32:47 -04:00