cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,881 Commits 10 Branches 0 Tags
fe4f9b0df92a75e16f7a9de8cdfbe73ca1385ad2
Commit Graph

355 Commits

Author SHA1 Message Date
Ccomp5950
976ae06e6b Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/say.dm
	code/modules/paperwork/paper.dm
	code/modules/telesci/bscrystal.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-25 21:14:58 -05:00
Ccomp5950
f56ddba067 Merge pull request #4791 from thelegendofbrian/manuals 
Update and clean up of all manuals
 2014-04-22 17:03:10 -05:00
Brian Cook
804e3f1a29 Update and clean up of all manuals 
- Fixed typos
- Fixed grammar/punctuation
- Corrected out-of-date details
- Formatted to match font type and size of rest of the game
 2014-04-20 16:09:57 -07:00
Brian Cook
507fb71b99 Fixed typo in RD Readme 
Scalple corrected to Scalpel
 2014-04-16 02:41:54 -07:00
Chinsky
06fd99b9ba Merge pull request #4723 from Jarcolr/diction 
Fixes some typos and descriptions
 2014-04-09 21:48:19 +04:00
Jarcolr
868dea5681 Grammar patch 1 
This is just the first one of many.
 2014-04-08 14:48:31 +03:00
Mloc
cd23a4b786 Merge pull request #4690 from Glloyd/ear_stuff_2 
A first pass at more realistic w_class values
 2014-04-05 16:23:59 +01:00
Ccomp5950
6f55b60120 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	html/changelog.html
 2014-04-04 01:14:31 -05:00
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
DJSnapshot
19db97f9e2 Merge pull request #4650 from Ccomp5950/damn_boulders 
Oversight, miners can now bump mine boulders just like the rock around them
 2014-03-31 00:27:04 -07:00
Ccomp5950
12b5db483e Oversight, miners can now bump mine boulders just like the rock around them. 
Screw you xenoarch code, screw you.
 2014-03-29 16:07:47 -05:00
Ccomp5950
2027892395 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-03-28 18:48:05 -05:00
Ccomp5950
56ef5c165c Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
 2014-03-28 18:46:04 -05:00
Mloc-Hibernia
dc97a2502a Revert "Merge pull request #4607 from Aryn/master" 
This reverts commit a1fee3e6c3, reversing
changes made to bf4533efde.
 2014-03-24 13:54:11 +00:00
iamgoofball
6fa4084d11 Adds 9 new Chameleon items. 
Chameleon Glasses, Exosuit, Gloves, Shoes, Hat, Gun, Mask, Backpack, and Gun.

The Gun does 1 damage and can disguise as any gun. As long as you don't fire it people won't notice that it shoots 1 damage rubber bullets.

These new items come in the Chameleon Kit, which replaces and contains the Chameleon Jumpsuit
 2014-03-23 14:08:23 -07:00
LightningIron
37a4b9e7da Added Alden-Saraspova counters to excavation closets; item previously unobtainable. 2014-03-21 15:24:19 -05:00
Aryn
1b8dc12a7c I think I fixed everything it is possible to stuff a light source into. 2014-03-19 01:02:27 -06:00
Ccomp5950
c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
Ccomp5950
5146268253 Runtime fix: Depth scanner now won't check the length of null lists. 
runtime error: Cannot read null.len
proc name: scan atom (/obj/item/device/depth_scanner/proc/scan_atom)
  source file: tools_depthscanner.dm,31
  usr: Some Guy (/mob/living/carbon/human)
  src: the depth analysis scanner (/obj/item/device/depth_scanner)
  call stack:
the depth analysis scanner (/obj/item/device/depth_scanner): scan atom(Some Guy (/mob/living/carbon/human), Rock (155,169,5) (/turf/simulated/mineral))
Rock (155,169,5) (/turf/simulated/mineral): attackby(the depth analysis scanner (/obj/item/device/depth_scanner), Some Guy (/mob/living/carbon/human))
Some Guy (/mob/living/carbon/human): ClickOn(Rock (155,169,5) (/turf/simulated/mineral), "icon-x=23;icon-y=13;left=1;scr...")
Rock (155,169,5) (/turf/simulated/mineral): Click(Rock (155,169,5) (/turf/simulated/mineral), "mapwindow.map", "icon-x=23;icon-y=13;left=1;scr...")
 2014-02-28 23:03:10 -06:00
ZekeSulastin
d4cce9be66 Laser scalpels are now producable 2014-02-26 15:23:08 -05:00
Ccomp5950
83ef93c41c Merge pull request #4270 from Baystation12/master 
Merge master into Dev
 2014-01-11 18:18:03 -08:00
LightningIron
cbd3f280af Forgot to include the /spray/ part of the chemsprayer path. 2014-01-10 20:43:27 -06:00
LightningIron
5119882536 Fixes #4286. 2014-01-10 20:36:20 -06:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
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