cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,852 Commits 8 Branches 0 Tags
fd8f6d9639989fee1e71522fc83d3590e1e5a510
Commit Graph

20217 Commits

Author SHA1 Message Date
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
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
Kelenius
cf78446463 Fixes #10730 2015-08-18 16:10:25 +03: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
Ravensdale
dbc13c423b Changes purple pipes to black 2015-08-17 23:45:57 -07:00
Zuhayr
80dbe49ee1 Removing unneeded defines. 2015-08-19 14:23:27 +09:30
Zuhayr
45c7934219 Floor instance cleanup. 2015-08-18 13:58:32 -07:00
Zuhayr
e3d9bc90e3 Added more colour defines, added functionality to the floor painter. 2015-08-18 13:41:04 -07:00
Zuhayr
ea56f3caa6 Minor cleanup of proxmove, changeturf, oldcode floors. 2015-08-18 12:13:52 -07:00
Zuhayr
a8dc3a282b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into turfs 2015-08-18 12:06:53 -07:00
Zuhayr
0e4c2430d1 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 2015-08-18 11:59:50 -07:00
Zuhayr
a896991657 Even comments need matching spans for Travis to pass. 2015-08-18 11:55:43 -07:00
Zuhayr
1b7f8d7be2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-18 11:32:46 -07:00
Zuhayr
71214d859e Merge with master. 2015-08-18 11:31:10 -07:00
Zuhayr
f2b2f2a22c Merge pull request #10711 from PsiOmegaDelta/150817-RandomShuttles 
Admin level doors are now always of the secure variant.
 2015-08-17 19:02:20 -07:00
GinjaNinja32
29be304c89 Merge pull request #10640 from Karolis2011/map_capture 
Added map capture tool
 2015-08-18 02:51:56 +01:00
Zuhayr
b6e7d33f3d Merge pull request #10715 from GinjaNinja32/irc 
Adds settable rank to IRC messages, changes it so non-admins can see …
 2015-08-17 18:51:53 -07:00
Zuhayr
5cb06f2c00 Merge pull request #10716 from mwerezak/gamemode 
Gamemode fixes
 2015-08-17 18:50:58 -07:00
mwerezak
87da0d4eb5 Fixes missing ), "spam" class 2015-08-17 21:24:59 -04:00
GinjaNinja32
f0c8db3d0f Adds settable rank to IRC messages, changes it so non-admins can see who on IRC is messaging them, and adds the name of the original sender to reply PMs 2015-08-18 02:16:50 +01:00
mwerezak
3ea5bfb131 Makes error message print to admins instead of world 2015-08-17 21:12:40 -04:00
mwerezak
e84f693219 Fixes certain antag roles from being unspawnable 
Fixes antag roles without certain flags from being unspawnable at round
start. Also adds more debug messages and feedback
 2015-08-17 21:11:57 -04:00
mwerezak
dadc6e4b77 Adds logging for admin spawning antags 2015-08-17 21:10:24 -04:00
mwerezak
e1f4551693 Fixes revs being unspawnable 
The player has not been spawned yet how can they possibly be a
/mob/living/carbon/human? Also fixes spawning revs via traitor panel.
 2015-08-17 21:04:23 -04:00
mwerezak
ef8e3a94a0 Fixes antag datum not respecting restricted_jobs depending on config 
Fixes #10657
 2015-08-17 21:00:22 -04:00
PsiOmega
439b976272 Admin level doors are now always of the secure variant. 
Players keep finding ways to surprise.
 2015-08-17 22:41:19 +02:00
mwerezak
b24e691b8c Merge pull request #10683 from SomeoneElse2/dev 
Research minor fixes, fix item design path definition, macro usage
 2015-08-17 14:23:00 -04:00
Chinsky
a4550dd957 Merge pull request #10699 from PsiOmegaDelta/150817-Robofite 
Harm icon state consistency.
 2015-08-17 20:32:41 +03:00
GinjaNinja32
e596d3bdd6 Merge pull request #10681 from mwerezak/lighting 
Ports fix for #10660
 2015-08-17 14:17:53 +01:00
PsiOmegaDelta
c82a0291e4 Utensil knives and spoons are no longer contraband. 
After careful considerations by the council the law concerning Possession of a Controlled Utensil is finally abolished.
The Dinnerware vending machine now offer both utensil knives and spoons without first having to hack them.
 2015-08-17 13:22:41 +02:00
Zuhayr
b9c95148fd Merge pull request #10688 from GinjaNinja32/chemistry-medical-equipment 
fix access artifacts from #9263
 2015-08-17 04:06:06 -07:00
Zuhayr
0e6a184f10 Merge pull request #10703 from GinjaNinja32/cryostorage 
adds admin logs to cryostorage
 2015-08-17 04:05:46 -07:00
GinjaNinja32
0c8a2b16e0 adds admin logs to cryostorage 2015-08-17 11:34:26 +01:00
Zuhayr
e61eb26da9 Merge pull request #10701 from GinjaNinja32/virus 
fix #10692
 2015-08-17 03:11:16 -07:00
Zuhayr
b27811ee07 Merge pull request #10700 from GinjaNinja32/locket 
Remove Sabess's custom item from code, it's been replaced with an entry in the new system.
 2015-08-17 03:04:42 -07:00