cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,224 Commits 8 Branches 0 Tags
69a080e2d611c6d45cb157861cade41f05d23721
Commit Graph

529 Commits

Author SHA1 Message Date
SkyMarshal
2308e71157 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 2014-01-08 21:33:17 -07:00
rymd
5f6a3a01a9 Fixed destructive analyzer failure messages. 2014-01-08 19:27:27 +00:00
Mloc
794be2b31e Fix previous commit for BS12. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-08 11:49:15 +00:00
Mark Aherne (Faerdan)
cdc8b8a40d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-01-06 02:49:50 +00:00
Mark Aherne (Faerdan)
f25052fd4c NanoUI updates. 
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).
 2014-01-06 02:49:25 +00:00
RKF45
9b62f7b23d Small fixes, again 2014-01-04 21:26:28 +01:00
Zuhayr
2c492d8289 Using DNA2 files from master. 2014-01-03 11:19:40 +10:30
Zuhayr
b6af4a1b4e Removes mime and HONK carts from protolathe. 2014-01-01 21:26:19 +10:30
DJSnapshot
1f5e278aa6 Added Sue's new weapon code and sprites. 2013-12-27 16:44:44 -08:00
DJSnapshot
782acc97cf Merge pull request #4103 from LightningIron/dev 
Removed R&D lockboxes.
 2013-12-23 15:25:17 -08:00
LightningIron
cb3e39c476 Removed R&D lockboxes. 2013-12-22 13:29:28 -06:00
Zuhayr
bda1297472 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 2013-12-22 23:13:22 +10:30
Zuhayr
5b1bc6f8da Tentative fix for #4037, unable to reproduce runtime to check. 2013-12-19 22:13:48 +10:30
Mloc-Argent
b175c6906b Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2013-12-13 19:13:43 +00:00
Ccomp5950
4cb9cd0911 Teleport bug fix 
Since we're unable to reproduce this bug in a testing environment and I've already concluded this isn't a telescience bug then I am leaning more towards Xenoarchiology, specifically the artifacts.

This sanity check basically makes it where if there is an artifact on null terf or inside a container it won't process the effect.
If it's the teleport effect of artifacts that is causing this to happen and it's based on the item being in nullspace somehow then it should squash the bug.
Though the root of this is probably #4037 I cannot reproduce the runtime either.

So here goes, a stab in the dark.
 2013-12-07 00:18:40 -06:00
Iamgoofball
e02566fd2f Changes Telescience to Projectile Trajectory! 
Conflicts:
	code/modules/telesci/gps.dm
	code/modules/telesci/telesci_computer.dm
 2013-11-28 17:50:09 +04:00
Iamgoofball
ac4e42bb2a After a very prolonged set of Syndicate budget cuts, Detomatix PDA carts are no longer buildable 2013-11-20 15:29:33 -08:00
Iamgoofball
7dcb47ec2a R.I.P H.O.N.KBlaster 9000. You died as you lived. Hidden in a crate. 2013-11-20 15:19:24 -08:00
Iamgoofball
b024087119 Merge branch 'smallchanges' of https://github.com/Iamgoofball/Baystation12 into smallchanges 
Conflicts:
	code/modules/research/designs.dm
 2013-11-20 15:00:36 -08:00
Iamgoofball
e36f0c3fac Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into smallchanges 
Conflicts:
	code/modules/research/designs.dm
 2013-11-20 14:59:33 -08:00
Iamgoofball
7fa80e799a made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-11-20 14:57:22 -08:00
Iamgoofball
ab43cc9cd6 made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-11-20 14:56:49 -08:00
Chinsky
60f644c401 Merge pull request #3941 from Iamgoofball/telesci 
Changes Telescience to Projectile Trajectory!
 2013-11-20 10:32:41 -08:00
Iamgoofball
06719b5aa9 added a fuck ton of small changes 2013-11-19 23:00:07 -08:00
Iamgoofball
c13f57613c Changes Telescience to Projectile Trajectory! 2013-11-19 19:23:51 -08:00
Chinsky
e3d19eceab Updated paths for smoke generator 2013-11-06 22:44:56 +04:00
Mloc-Argent
f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00: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. 
3677121b51
 2013-11-01 18:53:45 -07:00
Cael Aislinn
4988c6f7e5 resolves issues with artifact location 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-30 15:36:56 +10:00
Cael Aislinn
d19b9bc3b7 fixes the issue with coolant being ineffective 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 22:27:23 +10:00
Cael Aislinn
c419717255 tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:33:23 +10:00
Segrain
7ffafb657e Fix for acid pouring. 2013-10-27 21:56:08 +03:00
Iamgoofball
cfbe1c6ad1 Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker. 2013-10-26 21:52:13 -07:00
Kilakk
91e440e26c Fixes #3801, C4 will no longer destroy the analyzer it's inside of 
Committed to dev-freeze because the fix doesn't work with the click code on master
 2013-10-27 00:42:11 -04:00
Mloc-Argent
a1f55a50b1 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 20:27:39 +01:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01: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
Segrain
2304b743ce Reagent scanner's addition. 2013-08-17 17:00:33 +03:00
Zuhayr
0f0ac218b3 Commented out blob and wish granter. 2013-08-03 12:51:41 -07:00
Segrain
914d072c86 Camera networks. 2013-07-28 00:58:18 +03:00
Mloc-Argent
75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Segrain
82c3e6aa8c Fix for #3255. 2013-07-06 16:51:59 +03:00
Segrain
6804cf0518 Fix for #3254. 2013-07-06 16:50:01 +03:00
Mloc-Argent
08393161c0 Merge branch 'master' into BEF-staging 
Conflicts:
	config/config.txt

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-04 13:08:28 +01:00
Ispil
4c1bb073ff Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way. 2013-07-04 04:55:24 -07:00
Spamcat
11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops 
Conflicts:
	code/game/gamemodes/objective.dm
 2013-07-01 19:49:29 +04:00
Spamcat
10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
Zuhayr
8eec1d5379 Fixes #3008 2013-06-27 06:30:17 -07:00
Cael Aislinn
de91fba835 halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-06-23 10:27:48 +10:00