cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-30 03:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,653 Commits 2 Branches 1 Tag
8ccce503a99ea201ef7badcb8317af1b60b91f13
Commit Graph

170 Commits

Author SHA1 Message Date
Chinsky
cc9cf46dbe Merge pull request #5359 from Baystation12/master 
master -> dev
 2014-06-25 15:37:04 +04:00
Zuhayr
4cc0d6b6ee Fixes #5339 2014-06-24 11:35:08 +09:30
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +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
Hubblenaut
f12ee3f7b3 Fixes some printouts causing a runtime error when photocopied 2014-06-07 18:27:22 +02:00
Hubblenaut
eb2f9f0de1 Fixes stamp overlays being partly off the paper 2014-06-07 04:43:58 +02:00
SparklySheep
8c6ee1061e Removes Impedrezene from the Paralysis Pen 
Because random brain damage from a pen is terrible, especially if you're trying to extract information from the person.
 2014-06-05 21:53:16 -05:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Chinsky
61f00628f1 Added new BBCode tags, for tables and NT logo. Removes html support from paper. 2014-05-28 10:49:24 +04:00
Hubblenaut
cd917e4125 Small bugfix for merging paper bundles 2014-05-24 02:27:38 +02:00
Hubblenaut
7e10d64252 Attack paper bundles with paper bundles 2014-05-23 22:50:34 +02:00
Hubblenaut
e28ce8a366 Removed all prefixes of type 'paper - ' 2014-05-23 22:31:27 +02:00
Hubblenaut
041254ddc5 Fixes #5029 2014-05-23 22:23:02 +02:00
Hubblenaut
52a9f0eb8e Huge code cleanup and bugfixes, slight overlay modifications 2014-05-23 22:05:13 +02:00
Hubblenaut
81b73357a6 Fixes typo in code 2014-05-20 00:28:54 +02:00
Hubblenaut
a5b306ea70 Copies tiny icon of photos accordingly 2014-05-20 00:02:31 +02:00
Hubblenaut
40c90a88d6 Removes name prefix of renamed photos 2014-05-19 23:41:53 +02:00
Hubblenaut
7eb6f83932 Removing name prefix of cabinet-generated paper 2014-05-19 23:38:54 +02:00
Hubblenaut
66052c6eba Merge branch 'paperbundle' into dev 2014-05-16 03:50:10 +02:00
Hubblenaut
ee22d0558b Anyone who cannot read a paper is not able to read a bundle either 2014-05-16 00:05:21 +02:00
Hubblenaut
42ab7e2b00 Makes photos visible on bundles 2014-05-15 22:21:11 +02:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
 2014-05-11 13:19:09 +00:00
Hubblenaut
952d7c9e93 Adds ability to photocopy paper bundles 2014-05-10 19:03:42 +02:00
Zuhayr
a68c4e9c55 Fixes #3993 2014-05-10 10:26:05 +09:30
Hubblenaut
e277349e0e dynamic description and fixes 2014-05-08 20:15:25 +02:00
Hubblenaut
488f645f07 Adds the ability to remove the item viewed 2014-05-08 06:47:05 +02:00
Hubblenaut
435240ce2e Added ability to put paper bundles into folders and cabinets 2014-05-08 00:56:32 +02:00
Hubblenaut
8e08231c3a Adds functionalities for viewing, writing, stamping and adding photos 2014-05-07 22:50:15 +02:00
Hubblenaut
e620d41f41 Adds basic functionality to paperbundles 2014-05-07 03:54:05 +02:00
Hubblenaut
0f74b0f3bb Ability to spawn a paper bundle by hitting paper with paper 2014-05-06 20:26:53 +02:00
Jarcolr
76b65f59a9 Targeting eyes with book/paper shows book/paper 
This is a way to show other players papers without giving them the
paper/book.
 2014-05-03 19:56:55 +03:00
Mloc-Argent
e1ddec4a73 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-05-03 16:56:19 +01:00
Hubblenaut
87d4cf7238 Photocopiers now copy stamped papers, also minor bugfix 2014-04-30 05:46:51 +02:00
Ccomp5950
0ef558cfa2 Paperbin fix, now doesn't silently fail if it has papers shoved into it. 2014-04-27 08:54:31 -05:00
DJSnapshot
185f325944 fix for paper bin runtime 2014-04-25 21:42:59 -07:00
DJSnapshot
4236966e76 fixed what Mloc pointed out. 2014-04-25 13:14:01 -07:00
DJSnapshot
bbf7b31ccd Fixes to carbon copy paper. Basically merging it with regular paper bins. 2014-04-25 12:59:50 -07:00
Ravensdale
45d82c2e00 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/modules/mob/living/say.dm
	maps/tgstation2.dmm
 2014-04-16 22:13:48 -07:00
Ravensdale
68eda5201b Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron 
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/modules/paperwork/paper.dm
	html/changelog.html
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-04-16 21:44:26 -07:00
Brian Cook
5878cebb85 Fixed typo on Standard Operating Procedure paper 
Changed alrms to alarms
 2014-04-16 02:47:48 -07:00
DJSnapshot
756d7a83e9 Merge pull request #4715 from Iamgoofball/FUCKMONKEY 
Removes the last traces of Monkey Emergency
 2014-04-11 11:47:37 -07:00
Ravensdale
1d6655850f Changes all appropriate instances of toxins to phoron 2014-04-10 15:11:26 -07:00
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
Ccomp5950
9fb43f2333 Merge pull request #4706 from DJSnapshot/papers 
Carbonless copy papers
 2014-04-07 02:12:10 -05:00
DJSnapshot
36b2efd3df disregard failure. I made a silly. 2014-04-06 18:29:50 -07:00
iamgoofball
238451dbc9 die monkey emergency DIE 2014-04-06 12:05:41 -07:00
DJSnapshot
61036e529e Merge pull request #4692 from Hubblenaut/master 
Renamed paperwork no longer has 'paper -' in name
 2014-04-05 17:03:48 -07:00
DJSnapshot
4ea07e2617 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into papers 2014-04-05 16:24:56 -07:00