cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-19 19:27:02 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 11 Branches 0 Tags
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph
130 Commits
Author SHA1 Message Date
mwerezakandmwerezak ab2b4608e0 Fixes #6702 and cleanup 
Makes reinforced glass a subtype of glass, cleans up window creation copypasta.
Cleaned up window initialization leaking outside of the window constructor.
Removes unnecessary init_dir var from windows.
 2014-11-12 20:09:04 -05:00
PsiOmega f8ead9139a (De)constructable emergency shutters. 
Can now construct emergency shutter assemblies from metal sheets, same as door assemblies.
Requires air alarm circuits to complete, rather than airlock circuits.
 2014-10-31 13:35:48 +01:00
Mloc 9faec14707 donut boxes now update their icon to properly reflect their contents 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-10-05 19:24:30 +01:00
Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Zuhayr 67cb6e297e Merge pull request #6254 from Kelenius/OfStacks 
Of Stacks
 2014-09-02 17:58:28 +09:30
Kelenius 505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Zuhayr 066772b1ce Fixes #5879 2014-09-01 22:45:37 +09:30
Whitellama aa0ab32a9c Egg boxes and donut boxes can be constructed from cardboard 2014-08-28 18:27:51 -07:00
Kelenius a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
Zuhayr b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
GinjaNinja32 05e7c4a07a Moved all shard code to one file. Fixed #5992 2014-08-13 21:05:27 +01:00
Zuhayr 4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Mloc-Argent d5e9851b62 integrate XGM into the code 
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-07-22 19:52:12 +01:00
Chinsky a6c7093818 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into robust-squash 
Conflicts: lots
 2014-06-29 19:16:36 +04:00
HigginandChinsky 2556d3f227 Stunbatons now run on charge. 
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
 2014-06-29 17:46:06 +04:00
Mloc-Argent a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
mwerezak 37e63dfcb0 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().
 2014-06-22 00:13:22 -04:00
Zuhayr c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
Zuhayr 9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Zuhayr c3c6f72147 More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron. 2014-06-08 01:39:49 +09:30
Zuhayr 78918e4795 Entirely removed the Honker mech, other refs to bananium, adamantine and mythril. 2014-06-08 00:52:20 +09:30
Zuhayr c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
Zuhayr 95a6f9d613 First pass on ore distribution map and stationary drilling rig. 
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
 2014-06-07 23:07:49 +09:30
Zuhayr 5e682668b2 Cherrypicking vox spike throwers, made crossbows and pneumatic cannons constructable. 2014-05-10 02:10:06 +09:30
Zuhayr 1fc3ecf145 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-05-10 01:56:57 +09:30
Zuhayr 1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Mloc-Argent 6a11ca32f8 Merge remote-tracking branch 'upstream/master' into dev 2014-05-05 22:22:01 +01:00
Zuhayr 5ef994337b Fix for previous commit. 2014-05-03 20:13:20 +09:30
Zuhayr 0dfe70fe2b IPC will no longer take damage from walking in glass. Not sure why this was happening beforehand. 2014-05-03 20:08:45 +09:30
Ravensdale a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
RKF45 aa08abed18 Fix 2014-03-22 19:06:45 +01:00
RKF45 5d6f425dd4 Removal of bees 2014-03-22 18:45:28 +01:00
Segrain cec9b87289 Folder recipes. 2014-02-03 04:45:42 +03:00
Mloc c46d872e6c Merge remote-tracking branch 'upstream/master' into dev 2014-01-12 19:46:31 +00:00
Loganbacca 909928f3f9 Plasma glass stacking fix 2014-01-11 18:14:51 +13:00
Kyrah AbattoirandMloc-Argent 7315b75cca FIXED: inconsistencies with stack item names. 
CHANGE: stacks are gender = PLURAL by default because it fits.

Conflicts:
	code/game/objects/items/stacks/stack.dm
 2014-01-08 19:48:43 +00:00
Zuhayr ced5cf2020 Actually fixes #4030, previous commit fixes #4014 2013-12-05 21:59:12 +10:30
Iamgoofball 989c8b69c5 Fixed Copypasta again! 
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
 2013-11-02 11:36:14 -07:00
Iamgoofball 74b5a003cc Fixed Copypasta! 
Fixed Copypasta!
 2013-11-02 11:17:17 -07:00
Iamgoofball a75492d26b Startoad's plasma windows commit, I'm doing the github stuff for it. 
https://github.com/StarToad/Baystation12/commit/3677121b51af852ed951c214c57a08fab60222c1
 2013-11-01 18:53:45 -07:00
Segrain ace205b323 Code cleanup. 2013-10-18 08:40:45 +03:00
Mloc-Argent a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo 3557e12943 Suits with shoes protect against glass shards. 2013-08-28 12:49:23 +01:00
Mloc-Argent 8575b7a286 And once again, did that the wrong way around. Whoops. 
Fully reverts #3316.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:41:50 +01:00
Mloc-Argent adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-20 18:38:00 +01:00
LordBraindead 5d63943d07 Update mineral.dm 
removed sheettpye = "plastic" again because it snuck back in after being removed already
 2013-07-14 21:50:48 +02:00
LordBraindead 08d2e22220 fire update 
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
 2013-07-14 21:20:45 +02:00
SkyMarshal aa85e757d4 Added a better framework for multi-tile doors, pulling works strangely though. 2013-06-24 17:21:55 -07:00
Segrain 0d6e49742a Typo fix. 2013-06-24 06:06:00 +03:00