cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-18 18:57:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
27,136 Commits 11 Branches 0 Tags
fb6b94de8773e6855b362faf84ef8e0f427e608f
Commit Graph
315 Commits
Author SHA1 Message Date
PsiOmega a4fbb01e2b Makes it possible to write [date] and [time] to get the current date and time in ISO 8601 format. 2015-04-18 18:40:35 +02:00
volas 2f8bc856a5 Small fix after merge 2015-04-09 21:07:43 +03:00
PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
 2015-04-08 10:55:26 +02:00
PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/gamemodes/cult/runes.dm
 2015-04-08 10:40:38 +02:00
volas ef105f0659 Additional checks for paper work 2015-04-04 23:47:22 +03:00
Kelenius db30c15e4c Updates to science 
Protolathe and CI build procs moved to them from RD console.
Protolathe and CI now have a build queue. Designs take varying time to
build.
P and CI material storage is now a list instead of a set of vars.
origin_tech is now a list.
All sheets now contain exactly 2000 units of matter.
In design datum, chemicals and materials are two separate lists.
Designs are now sorted. The method is kinda hacky but flexible. They
have a var, sort_string. Designs are sorted alphabetically using it.
Circuits how show whether they build a machine or a computer in CI menu.
Adds item construction, for now protolathe is used.
 2015-04-04 13:38:03 +03:00
volas 2622d2dbfc sanitize() refactor: fourth pass 2015-04-03 00:40:57 +03:00
Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-03-31 17:44:42 +03:00
= d77010221c Merge with dev. 2015-03-30 08:36:52 +10:30
Kelenius 24ef7752cd Merge branch 'Baystation12/dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
 2015-03-28 19:14:59 +03:00
Kelenius b4b635f32d Chemistry commit 
I messed something in the git
 2015-03-25 19:09:10 +03:00
Zuhayr 97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
volas 31360a344b merge fix 2015-03-25 01:13:23 +03:00
volas e3d41c3112 Merge remote-tracking branch 'upstream/dev' into sanitize_procs 2015-03-25 01:06:32 +03:00
Zuhayr 3fe4162719 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs 2015-03-25 00:29:59 +10:30
Zuhayr a63b9b4e73 Beginning to port over new icon update from limbs branch. WIP 2015-03-24 23:48:54 +10:30
Zuhayr b9072baa97 Merge with dev. 2015-03-24 14:41:07 +10:30
PsiOmega bd48c76620 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 21:14:32 +01:00
Chinsky a9ee51bc64 Readded missing check for paper editing 
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
 2015-03-23 23:02:43 +03:00
volas f8822626bb sanitize() refactor: second pass(other sanitize functions) 2015-03-23 01:38:09 +03:00
volas 855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
Zuhayr e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
mwerezak e840ba2d25 Fixes photocopier runtime 2015-03-09 12:12:31 -04:00
mwerezak 17780e196a Fixes medical record cabinet runtime 2015-03-09 03:18:38 -04:00
PsiOmega bdce7a8e41 Fixes #8322. 
When copying a photo new instances are created of relevant icons, instead of referencing them.
 2015-03-01 15:21:15 +01:00
Zuhayr 3fc9c0aec7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-15 22:03:17 +10:30
PsiOmega fde03b2e94 Containers now properly checks types instead of string paths. 
Security and medical belts could contain now no longer existing objects. These types have been removed.

Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
	code/game/objects/structures/inflatable.dm
	code/modules/clothing/under/ties.dm
 2015-02-14 14:16:40 +01:00
Zuhayr 5e87b21d44 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro 2015-02-14 09:32:17 +10:30
PsiOmega 02dc9e3008 Lightly boosts the clerical kit. 
Adds destination tagger, wrapping paper, hand labeler, and the ability to select pen color.
 2015-02-10 20:12:32 +01:00
Zuhayr 3b60a5959e Added labelling for hydro trays. 2015-02-04 10:54:18 +10:30
volas ea8e848463 copytext() check for some input 2015-02-01 23:16:04 +03:00
volas 8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
Chinsky b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass 
Removes FPRINT and TABLEPASS flags
 2015-01-30 16:17:41 +03:00
PsiOmega fa931ae9a9 Photo cache improvements. 
According to http://www.byond.com/docs/ref/info.html#/proc/browse_rsc browse_rsc() does not resend already cached data, however there is likely also a check to ensure that this data is up to date (using checksums or otherwise) or clients would only ever see the first photo they viewed in a given round.
This small change attempts to ensure that a given photo only has to be downloaded once by appending the photo id to the file name, reducing the risk of #7966 happening.
 2015-01-30 10:37:42 +01:00
Loganbacca 34d44f8732 Tape fixes 
- Fixed taping paper bundles
- Reduced issues with sticking papers around corners
- Removed a couple of colons from paper_bundle.dm
 2015-01-26 15:16:27 +13:00
Kelenius 10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Loganbacca 5fc035bffc Ghost labeller fix 
No you cant stick labels on ghosts
 2015-01-15 21:21:13 +13:00
Ravensdale 759373ac0a Fixes runtime with hand labelers 2015-01-13 09:52:14 -08:00
PsiOmega 2e34cb79a5 Morphic Clerical Kit 
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
 2014-12-12 10:07:42 +01:00
PsiOmega 087cc1882c Fixes #7366. 
Kills unecessary photo datum which wasn't even used correctly anymore.
Photos have a global id for ease of synth syncing.
Changes how law/photo syncing is handled when pulsing the appropriate borg wire.
Also ensures re-synced borgs are added/removed from the appropriate AIs.
 2014-12-10 21:54:57 +01:00
Loganbacca 224b2f3899 Duct Tape 
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
 2014-12-02 23:17:45 +13:00
PsiOmega 0f8156e77e Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
 2014-11-29 10:09:03 +01:00
mwerezak ff8b57b8c0 Fixes #7144 2014-11-27 23:31:40 -05:00
Amunak 245a4f142d Whitespace changed by saving in DreamMaker 2014-11-26 16:24:51 +01:00
Amunak a104c199a7 Renaming paper to its original value will now revert it to initial, not just 'paper' 2014-11-26 16:24:10 +01:00
Amunak bfe738cf8d Ghosts can view paper from anywhere, improved the 'far' message 2014-11-26 16:21:38 +01:00
Amunak 319e3abd27 Papers will now have a nice description like every other item 2014-11-26 16:20:32 +01:00
PsiOmega 2a796f2ddd Merge remote-tracking branch 'upstream/master' into dev 2014-11-21 10:27:56 +01:00
mwerezak 348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine 
Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm
 2014-11-20 14:57:35 -05:00
mwerezak 8a975fec06 Removes interdepartment fax cooldown 2014-11-20 14:36:05 -05:00