cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,959 Commits 2 Branches 1 Tag
f5a790a037068f6f115cc89fb38b40a41f25c99a
Commit Graph

804 Commits

Author SHA1 Message Date
Erthilo
014b91cda5 Compile fixes. 2012-05-31 15:14:53 +01:00
Erthilo
8e72965077 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/grenades.dm
	code/game/objects/items/weapons/implants/implant.dm
	code/game/objects/radio/headset.dm
	code/game/objects/radio/radio.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/clothing/glasses.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/paperwork/paper.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	icons/mob/suit.dmi
 2012-05-31 15:09:35 +01:00
SkyMarshal
2bc692ec4d Some improvements for the LiquidFood stuff. 2012-05-30 16:26:24 -07:00
Lexus Langg
04f19dea7f Added a Liquidfood dispenser, food, charge, and crate using a combo of mine and Kirby's sprite. 
Fully tested, everything seems to work fine.
Signed-off-by: Lexus Langg <jaedonjacobi@yahoo.com>
 2012-05-30 15:27:00 -07:00
Mloc
fbb67b2e42 Huge commit! Standardizes var definitions in most places. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-05-29 16:26:48 +01:00
Erthilo
b409a84f2d Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
 2012-05-29 15:00:11 +01:00
SkyMarshal
12392f74dd Merge pull request #1185 from Erthilo/master 
HUD changes, medic spawn items, cow sprites, water bottles, Tajaran/Soghun fixes
 2012-05-28 22:13:53 -07:00
Erthilo
112fb5433e TG: - Some runtime-prevention tweaks so that impatient coders don't just break 
everything somewhere down the line.
Revision: r3665
Author: 	 baloh.matevz
 2012-05-29 00:33:25 +01:00
Erthilo
7f77c0ec91 TG: - Standardized var definition for RND and radio code (possibly some other stuff) 
- Removed all cases (that I saw anyway) of flags being defined by static
numbers.
Revision: r3663
Author: 	 baloh.matevz
 2012-05-28 23:37:43 +01:00
Erthilo
a7dd312b3e TG: - Removed support for the ONBACK and ONBELT flags. 
- Replaced them with a whole range of inventory slot flags. These now govern
whether an item can or can't be placed in a certain inventory slot. See setup.dm
for information on the flags. These flags only affect humans tho, as humans are
the only beings with an inventory to talk of.
- Standardized some gun code and some other pieces of code as I came accross
them. I hate indented variable definitions!

This commit should not bring any change whatsoever to the game from a player's
perspective.
Revision: r3659
Author: 	 baloh.matevz
 2012-05-28 22:58:57 +01:00
Erthilo
e106fe4c51 Adds water bottles to vending machines. 2012-05-28 20:14:19 +01:00
SkyMarshal
7a37d9bb05 Merge pull request #1167 from Erthilo/TGUpdates 
TG Updates r3648 to r3657
 2012-05-28 11:52:44 -07:00
Albert Iordache
922a7cc509 Fixed an ATM bug 2012-05-27 08:42:35 +03:00
Erthilo
ca62d85b83 TG: - Crew monitoring computer pup-up screen is wider. 
Revision: r3651
Author: 	 baloh.matevz
 2012-05-25 22:47:34 +01:00
Erthilo
c9ea8a4c3d Fix for duplicate health analysers in the NanoMed dispensers, and changelog. Also changes old hud storage boxes to solid. 2012-05-25 04:09:17 +01:00
Erthilo
b7b33fc91a /obj/item/weapon/spacecash change to /obj/item/weapon/money 
Can now split and stack money properly.

Fixes genetics/research access door and also money path changes.
 2012-05-21 23:56:48 +01:00
Erthilo
7fd99c7d3a TG: -Bunch of new/updated locker sprites. Most noticeable in mining and engineering 
-New wardrobe closets for several departments
Revision: r3633
Author: 	 ericgfw...@hotmail.com
 2012-05-21 20:40:08 +01:00
Erthilo
911cd7fca7 TG: -Added some positive reagents to certain foods. 
Revision: r3627
Author: 	 d_h2...@yahoo.com
 2012-05-21 17:13:29 +01:00
caelaislinn
b626812c83 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/game/machinery/computer/lockdown.dm

Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 17:48:12 +10:00
SkyMarshal
58570a0f65 As many bugfixes as I could cram into here. 2012-05-20 14:23:10 -07:00
caelaislinn
aa67c605dc fixed lockdown computer. 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-21 02:11:47 +10:00
Erthilo
229fad369e Adds right-click verbs for pick up and closet open/close. 2012-05-20 00:25:05 +01:00
caelaislinn
1587ad0abc Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-05-19 20:00:05 +10:00
Erthilo
0cec252e5b Rearranged satchel stuff. 2012-05-19 01:58:53 +01:00
Erthilo
4f0763ada4 TG: - Wallets once again spawn in the satchels in the cabinets in the dorm. 
- Wallets now fit in pockets
- If you are clicking on a storage item in your pocket with an empty hand it
will return that item to your hand
Revision: r3610
Author: 	 baloh.matevz
 2012-05-19 01:44:24 +01:00
caelaislinn
453ffce556 added WIP birdmen, tweaked / cleaned up gas turbine gens, tweaked lockdown computers and poddoors. 
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
 2012-05-19 03:22:42 +10:00
caelaislinn
869da0db36 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-05-19 01:19:50 +10:00
Erthilo
fa8e8decb4 Made rollerbeds collapsible. They don't fit in containers, so it's just easier to take to location. Added new sprites and sounds for cable cuffs, and new sounds for table smashy. 2012-05-18 00:56:53 +01:00
Erthilo
6130ce6d4a Adds camera film which can be used to refill cameras. Added to detectives wardrobe and arts and crafts crate. Minor grammar and punctuation fixes. 2012-05-17 21:32:34 +01:00
Erthilo
e9c3c990b1 Ported Animus Station's currency system, credit to @EditorRUS. ATM's now require a pin which is generated and stored in mob notes. Space cash renamed to stack of credits, and same value credits can be stacked together. Credits are generated randomly between 500 to 2000 credits. Credits or coins can be inserted and converted to credits. Still not used for anything! 2012-05-17 20:50:47 +01:00
caelaislinn
afc7e796b6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-05-18 04:10:14 +10:00
Albert Iordache
c93bb9f245 Fixed #1079, airlock permissions for the prison wing and QM's office. 2012-05-17 13:41:01 +03:00
Cael Aislinn
a625c23cc3 test 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2012-05-17 16:13:03 +10:00
Erthilo
db3b96c0a7 Adds cable restraints that can be made from 15 lengths of coil, and fixes table grammar. Also reverts lockdown changes so it works for the Exodus for now. 2012-05-15 22:24:25 +01:00
Erthilo
51de17e8ad TG: Committing from the Proposed Commit forum: 
Work by Neek
- Hulk Hogan moustache fix

Work by Yvarov
- Alien Unconciousness fix (Fixes  Issue 283 )
- - Also commented out alien snoring all over because aliens don't snore.
- Replacement light box fix (Fixes  Issue 398 )
- Syringe gun attack logs added (Fixes  Issue 465 )

Work by QualityVan
- Nettle and Death Nettle force based on potency.
Revision: r3593
Author: 	 johnsonmt88
 2012-05-15 00:58:12 +01:00
Erthilo
496d6ce13b Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 
Conflicts:
	code/defines/obj/supplypacks.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2012-05-15 00:51:50 +01:00
Erthilo
97141927ef TG: Fixed an issue where contraband crates could not be ordered and would prevent 
other crates in the same shipment from arriving.

Generalised the crate contents randomisation code to allow for future random-
contents crates and avoid unnecessary copypasted code.
Revision: r3588
Author: 	 musketstgstation
 2012-05-15 00:25:52 +01:00
SkyMarshal
46e104f978 Merge pull request #1044 from Erthilo/master 
TG Updates up to r3585
 2012-05-13 21:38:34 -07:00
SkyMarshal
bdc0de5fd0 Fixes numerous bugs from the Runtimes topic, more sanity checking on pipes and atmos stuff for the new FEA. 2012-05-13 13:52:40 -07:00
Erthilo
1443df2beb TG: Updated fire extinguisher cabinets- mini extinguishers now fit in them, and the 
path has changed!
/obj/structure/closet/extinguisher to /obj/structure/extinguisher_cabinet

Added Invisty's dragon dildo sprite
Updated the husk icons for carn

Revision: r3584
Author: 	 petethegoat

-New sound effects for circular saws and surgical drills.
-New sprites for mass-spectrometers and advanced mass-spectrometers.
-Sprites for empty bookshelves and book overlays added to library.dmi.

Revision: r3585
Author: 	 d_h2...@yahoo.com
 2012-05-13 02:19:36 +01:00
Erthilo
8c3659b1c7 TG: -Laser tag guns no longer give combat tech of 3. 
-Cardborg Helmets and Cueball helmets no longer protect as well as sec helmets.
Reorganized the clothing/head.dm. PLEASE take note of the parent when making
child objects, people.
-Laser tag vests can now hold their matching laser tag guns.
-Harebells can now be harvested.
-Sprite for the new mini-extinguishers in the extinguisher closets. Needs
supporting code still.
-Added towel sprite to items.dmi.
Revision: r3582
Author: 	 d_h2...@yahoo.com
 2012-05-13 00:56:53 +01:00
Erthilo
035bc3541f Fixes contraband and arts and craft crate. 2012-05-12 00:12:15 +01:00
SkyMarshal
83b69a94b9 Merge pull request #1017 from Hawk-v3/master 
HAWKMAPS (GASP)
 2012-05-10 15:28:13 -07:00
Hawk-v3
c57476fcc7 HAWKMAPS(Gasp) 
Shared Breakroom for Atmos, Engineering and Robotics. It's a proper den and has, to ENVY OF STATION, comfy chairs. And a recharger for borgbros.

Added updated armoury page.
 2012-05-10 23:26:44 +01:00
Erthilo
50f5837ac6 TG: •Contraband supply packs now contain the DreadoryCobullshit cigarettes. 
Pete, read the comments, the contraband crate is supposed to be a random-
assortment-of-goodies pack, and will gradually add more contraband to it.
Revision: r3573
Author: 	 polyxenitopalidou
 2012-05-10 21:03:16 +01:00
Erthilo
5b52e2ce64 TG: -Emergency Toolboxes now contain smaller, lighter fire extinguishers that 
actually fit inside them!
Revision: r3568
Author: 	 d_h2...@yahoo.com
 2012-05-10 02:52:05 +01:00
Erthilo
f484bdfb52 TG: Minor cigarette fixes, and added the DromedaryCo cigarette crate as a new 
contraband crate.
Also added WJohnston's new rolled up poster sprite.
Revision: r3566
Author: 	 petethegoat
 2012-05-10 02:47:23 +01:00
Erthilo
ad95edc954 TG: Wraiths now have their own jaunt animation, courtesy of Ausops. 
Revision: r3551
Author: 	 kortgstation
 2012-05-10 01:49:04 +01:00
Erthilo
721eaefee1 Changes balloon description. It's just a balloon damnit. 2012-05-09 00:29:17 +01:00
Erthilo
76f88da735 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates 2012-05-08 18:28:05 +01:00