cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-19 22:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,392 Commits 2 Branches 1 Tag
0624fced644fb2388c91a54dbe7dfee71df98c18
Commit Graph

256 Commits

Author SHA1 Message Date
Higgin
2556d3f227 Stunbatons now run on charge. 
Adds improvised weapons.
Increases unarmed stun time, decreases push stun time.
Increases melee embedding chance.
 2014-06-29 17:46:06 +04:00
Zuhayr
c7e9e1aa2a Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing. 2014-06-29 09:40:37 +09:30
PsiOmega
906ef41522 The tactical closet now calls ..() in its New() proc, allows for swallowing items placed on-top among other things. 2014-06-25 18:32:48 +02:00
Zuhayr
a5c2af7a57 Shuffling around table and crate knock/climb procs. 2014-06-24 11:11:02 +09:30
Zuhayr
7fe8a89e58 Makes table/crate falling a bit more dangerous. 2014-06-24 07:17:24 +09:30
Zuhayr
8fe013d531 Allows climbing onto tables and crates, also adds falling off if you are dumb enough to stand on one that is flipped or opened. 2014-06-24 03:21:27 +09:30
Hubblenaut
909c2d44a9 Removes medical belts from lockers 2014-06-18 22:35:56 +02:00
Zuhayr
c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
Hubblenaut
b54bc552e7 Personal closets are resettable with verb 'Reset Lock' 2014-05-20 01:25:06 +02: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
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
RavingManiac
ac9d37261f Check restricted to closets and storage items due to lag concerns. 2014-04-07 20:45:05 +08: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
RKF45
5d6f425dd4 Removal of bees 2014-03-22 18:45:28 +01: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
Chinsky
5ed6e58430 Readded welder backpack. 2014-03-11 02:06:30 +04:00
Ccomp5950
63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm
 2014-02-20 19:16:23 -06:00
Loganbacca
da3d82c1de Closet fixes 
- Fixed a few closets not adding items to their contents at round start (wardrobes have the same issue, but I've already fixed them on master)
 2014-02-20 17:54:27 +13:00
Loganbacca
b8b1bd82a4 Wardrobe fix 
Fixes #4447

- Added a parent call to each wardrobe subtypes New() proc.
Wardrobes weren't calling obj/structure/closet/New(), so weren't adding items in the same location to their contents when first created.

- Removed wardrobe/New() proc.
So all subtypes don't inherit an extra set of blue uniforms and brown shoes. Only one wardrobe on the map is of this type, and it's on the derelict, so didn't think it was worth making a map change.
 2014-02-18 11:12:27 +13:00
Loganbacca
4b1bb13ace Crate and closet updates 
- Added atmos themed sprite for atmospheric technician secure closets
- Added a second radiation suit to radiation suit closets
- Added a solar pack crate (because adding crates to the map with this many objects manually is silly)
 2014-02-08 18:35:13 +13:00
RavingManiac
30915b5ba4 Escape shuttle modified after feedback. 
Wall emergency lockers now contain two breath masks and two emergency oxygen tanks.

Emergency ration crates contain two boxes of donk-pockets. The escape shuttle has two crates at the back.
 2014-02-02 16:04:11 +08:00
RKF45
8fbcda2a0b Reintroducing the dough-based cooking system. 2014-02-01 02:17:38 +01:00
suethecake
6f69e7f821 Stuff. 2014-01-29 18:15:35 -06:00
Cluwnes Honk
2069a9e83c Personnelly, I feel this pull request was successfull. 
Spelling fixes.

Conflicts:
	code/game/machinery/newscaster.dm
 2014-01-08 19:26:10 +00:00
DJSnapshot
b294174acb Openable soda cans and beer bottles! 2013-12-31 17:52:12 -08:00
Zuhayr
53c94f76bd Merge pull request #4134 from comma/gunlocker 
Adds gun cabinets - special snowflake secure closets.
 2013-12-29 06:25:12 -08:00
Chinsky
e63d5c14a5 BYOND cannot into chain assignment 2013-12-29 17:52:56 +04:00
Chinsky
94e94dfa5d Adds gun cabinets - special snowflake secure closets. 
Specialness is that icon of closed cabinet depends on if there are guns in it, and their type.
 2013-12-22 23:10:22 +04:00
fauxki
a6aa087e00 Places RD Alt uniform, RD dress, and leather shoes in RD closet. 2013-12-22 04:17:46 -08:00
fauxki
247cae41a1 Adds in the red shoes I forgot to put into the closet that has all the colored shoes in it. 2013-12-20 01:29:13 -08:00
Chinsky
83d1924b83 Commiting SueTheCake's detective things. 
-New set of clothes spawning in the closet.
-Replacement of revolver by semiauto gun, with update to autolathe recipies.
 2013-11-27 04:10:06 +04:00
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03:00
Segrain
ace205b323 Code cleanup. 2013-10-18 08:40:45 +03:00
Segrain
21718c5bac Fix for #3764. 2013-10-13 03:44:43 +03:00
Chinsky
3c7c715e06 Merge pull request #3727 from fauxki/dev 
Dev - Lightswitches for Medbay / Beach Holodeck Update
 2013-10-08 21:23:42 -07: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
fauxki
a9de4f00f2 * Adds swimming fins, flotation ducky belt, and snorkel to code. Two of the fins and snorkels will spawn in the athletics closet with the swimming suits. The flotation device spawns on the beach holodeck. 2013-10-05 08:25:03 -07:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Zuhayr
dabd0866a2 As above. 2013-08-28 23:34:12 -07:00
Zuhayr
c17347ef77 Added CubeJackal's security gear to the appropriate lockers. 2013-08-28 22:31:22 -07:00
meyar
c0d264fed7 Fixes fire lockers. They actually start with stuff in them. 2013-08-23 20:39:08 -04:00
Zuhayr
2cf9a18f9e Merge pull request #3572 from Baystation12/master 
Merging master into dev.
 2013-08-22 23:01:15 -07:00
Segrain
57c1a9a556 Code cleanup. 2013-08-22 10:11:49 +03:00
Mloc-Argent
1e980a9cc1 Merge branch 'master' into dev 2013-08-15 15:29:53 +01:00
Zuhayr
d937900d13 Compile fix. 2013-08-14 10:29:17 -07:00
Zuhayr
1c30387a44 Merge resolution in Engineering.dm 2013-08-14 10:05:55 -07:00
Zuhayr
033b0450a0 Engineering merge. 2013-08-14 20:00:38 -07:00
DJSnapshot
cb20332de5 Added potential for chief engineer's locker to spawn with either a brown vest or webbing 2013-08-13 16:16:20 -07:00