cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-27 10:32:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,928 Commits 2 Branches 1 Tag
6ba41bbc2af53712d5fd46b74cb62ea4f93af30b
Commit Graph

20269 Commits

Author SHA1 Message Date
Kelenius
6ba41bbc2a Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	code/__defines/research.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha_parts.dm
	code/modules/research/designs.dm
	maps/exodus-1.dmm
 2015-08-21 16:59:57 +03:00
PsiOmegaDelta
921015d6f3 Fixes computers with custom icon states. 
It broke the overlay system. Also makes the power monitoring computer use the overlay system.
 2015-08-21 09:50:39 +02:00
Chinsky
317eaf4771 Merge pull request #10101 from mwerezak/shards 
Refactors obj flags and changes defined bitflag representation
 2015-08-20 19:47:58 +03:00
Chinsky
b2e9a7c2a6 Merge pull request #9942 from RavingManiac/dev 
Sound environment revamp
 2015-08-20 19:47:09 +03:00
Zuhayr
c8b6813426 Merge pull request #10005 from PsiOmegaDelta/150703-Uplinkery 
Uplink Items - Part III
 2015-08-20 19:19:12 +09:30
Zuhayr
fd007cdea0 Merge pull request #10765 from PsiOmegaDelta/150820-ComputerOverlays 
More computer overlay changes.
 2015-08-20 19:18:13 +09:30
GinjaNinja32
dc35b0e717 fix wonky diagonal inputs 2015-08-20 09:42:48 +01:00
PsiOmegaDelta
1b64487f8d More computer overlay changes. 
Fixes #10764 and a couple other computers.
 2015-08-20 08:38:43 +02:00
Ccomp5950
11eefbc4c9 Merge pull request #9856 from Hubblenaut/dev 
Beret Resprites
 2015-08-19 17:56:37 -04:00
PsiOmega
c43ce91a99 Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem 2015-08-19 18:25:41 +02:00
PsiOmegaDelta
7241b59a70 Merge remote-tracking branch 'upstream/dev' into 150819-MoreDecalsBecauseYouLoveThem 2015-08-19 10:52:04 +02:00
PsiOmegaDelta
f46fcfaf52 Adds more decals. Moving turfs now includes under/overlays. 2015-08-19 10:44:42 +02:00
GinjaNinja32
a9773207b2 Merge remote-tracking branch 'upstream/dev' into client_dir 2015-08-19 09:42:48 +01:00
GinjaNinja32
03166ab4e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-19 07:17:03 +01:00
GinjaNinja32
894b559e29 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-19 07:04:40 +01:00
mwerezak
5603884095 Removes #undefine 2015-08-18 17:20:39 -04:00
mwerezak
1cb4afd906 Removes CHARGELEVEL_DEFAULT 2015-08-18 17:20:38 -04:00
mwerezak
58bc7fbb40 Cleans up dynamic member lookup 2015-08-18 17:20:37 -04:00
mwerezak
fd8f6d9639 Removes MASK/HEADCOVERSMOUTH 
Code that used to check this flag now checks body_parts_covered for FACE
instead. Added a FLEXIBLEMATERIAL item flag to continue to allow vox to
eat food without poisoning themselves.
 2015-08-18 17:20:36 -04:00
mwerezak
d70f064b1b Adjusts phoron exposure to use body_parts_covered 2015-08-18 17:18:25 -04:00
mwerezak
ac738f3db4 Moves flags values to item_flags var 
Moves flags that seemed to pertain more to equipment to a new item_flags
var in /obj/item
 2015-08-18 17:18:25 -04:00
mwerezak
2cb46e035c Removes unused obj flags and fixes overlapping flags 
Removes ONESIZEFITSALL and NOSHIELD, which were unused.
 2015-08-18 17:08:41 -04:00
mwerezak
70b74518a1 Moves BLOCKHAIR flags to flags_inv 
Moves BLOCKHAIR and BLOCKHEADHAIR flags to flags_inv
 2015-08-18 17:06:50 -04:00
mwerezak
b80c01ffbe Removes *COVERSEYES 
Removes (HEAD|MASK|GLASSES)COVERSEYES flags, in favour of using
body_parts_covered.
 2015-08-18 17:06:49 -04:00
mwerezak
d3a40f4269 Cleans up defines 
Replaces bitflag values with hex literals. Some other miscellaneous
cleanup.
 2015-08-18 17:05:26 -04:00
HarpyEagle
2947a062a8 Decouples shard stepping protection from siemens_coefficient 2015-08-18 17:02:46 -04:00
HarpyEagle
651c2c6ba6 Species spawn_flags 
Moves some more species flags into a new spawn_flags var.
 2015-08-18 17:02:45 -04:00
HarpyEagle
8a9caac7cc Splits species flags 
Splits several species flags off into a separate appearance_flags var, to avoid rollover.
 2015-08-18 17:02:44 -04:00
HarpyEagle
c136bd47cc Improves shard-stepping 2015-08-18 17:01:39 -04:00
mwerezak
0d9ef708d5 Merge pull request #9905 from GinjaNinja32/jumpskirt 
Adds SilveryFerret's Robotics Jumpskirt as a general custom loadout item
 2015-08-18 16:55:47 -04:00
GinjaNinja32
f950ded9af Merge pull request #10737 from PsiOmegaDelta/150818-RealFunny 
Another Hurt/Harm fix.
 2015-08-18 18:52:09 +01:00
GinjaNinja32
9f05c50a7c Merge pull request #10732 from mwerezak/skipjack3 
Fixes #10723
 2015-08-18 18:51:37 +01:00
GinjaNinja32
1957029890 HUD cleanup, human/monkey HUD now turns correctly with client.dir 2015-08-18 18:21:25 +01:00
PsiOmega
0d10d53b65 Another Hurt/Harm fix. 
Apparently clicking the intents directly or cycling through them updates the icons differently. Nice.
 2015-08-18 18:41:24 +02:00
PsiOmega
e92e819bd9 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-18 18:29:01 +02:00
PsiOmega
75c7313c46 On merge changes and map conflict fixes. 2015-08-18 18:19:51 +02:00
PsiOmega
8138815dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-08-18 18:05:16 +02:00
GinjaNinja32
912f689e51 Diagonal, ctrl+dir, and alt+dir actions are now consistent with client.dir 2015-08-18 16:05:37 +01:00
GinjaNinja32
111400505d Conveyors, signs, door buttons and crematoriums will now rotate correctly with client.dir 2015-08-18 15:48:55 +01:00
mwerezak
b361f9ad12 Fixes #10723 2015-08-18 10:28:06 -04:00
GinjaNinja32
2d5e221906 Sleepers, body scanners, intercoms, sinks, stools and fire extinguisher cabinets will now rotate correctly with client.dir 2015-08-18 14:51:59 +01:00
Kelenius
cf78446463 Fixes #10730 2015-08-18 16:10:25 +03:00
GinjaNinja32
a5e975ce1c Fix cables and windows; sleepers, cryopods and donut boxes will now rotate correctly with client.dir 2015-08-18 13:43:11 +01:00
PsiOmegaDelta
7106626176 Merge remote-tracking branch 'upstream/dev' into 150818-Decals 2015-08-18 12:39:38 +02:00
PsiOmegaDelta
1ce65e0aa8 Post-merge decal cleanup. 
Misc decal additions and merge fixes on most Z-levels.
Crescent windows were all kinds of a mess for some reason. Replaced instances with a spawner instead.
Asteroid solars were all cramped with solid walls. Gave them more space to allow for at least some power production.

Fixes warning stripe corners on all Z-levels. To correct the following search replace can be used:
/obj/effect/floor_decal/industrial/warning/corner{dir = 8} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 5}
/obj/effect/floor_decal/industrial/warning/corner{dir = 1} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 8}
/obj/effect/floor_decal/industrial/warning/corner{dir = 5} -> /obj/effect/floor_decal/industrial/warning/corner{dir = 1}
 2015-08-18 12:33:49 +02:00
Kelenius
afc5414ed9 Removes a few outdated mob mentions. Fixes a few things. Almost definitely fixes #7570. 2015-08-18 10:48:22 +03:00
mwerezak
7c8c42137e Fixes #10680 2015-08-18 02:54:13 -04:00
Ravensdale
dbc13c423b Changes purple pipes to black 2015-08-17 23:45:57 -07:00
GinjaNinja32
5a5eb31e99 Barsigns now rotate correctly with client.dir, improved the code a bit 2015-08-18 07:18:13 +01:00
Zuhayr
80dbe49ee1 Removing unneeded defines. 2015-08-19 14:23:27 +09:30