cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,978 Commits 5 Branches 0 Tags
d44e8cc0ab78104609b8bd3813328bbed0b14fa7
Commit Graph

20310 Commits

Author SHA1 Message Date
mwerezak
d44e8cc0ab Adds missing TK move cooldowns, adjusts click move cooldowns 2015-08-21 23:21:54 -04:00
mwerezak
4396e5a5bc Merge pull request #9891 from Zuhayr/dev 
Adds variables for CentComm, NanoTrasen and the station name.
 2015-08-21 14:23:57 -04:00
Zuhayr
69dfd23d1b Compile fix. 2015-08-22 03:26:41 +09:30
Zuhayr
56131e1053 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into devupdate 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 03:17:16 +09:30
Zuhayr
3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr
eb0f48d412 Xenos use bodytype for species_restricted, Vox can wear softsuits. 
Conflicts:
	code/modules/clothing/clothing.dm
 2015-08-22 02:54:14 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
Zuhayr
8701205783 Pariah nerfs. 
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
 2015-08-22 02:51:42 +09:30
Zuhayr
edf74e4721 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-22 02:30:14 +09:30
Zuhayr
bf313ae238 Merge pull request #9851 from mwerezak/armourpen 
Adds armor penetration system
 2015-08-22 02:22:17 +09:30
Zuhayr
55c1331261 Merge pull request #10004 from PsiOmegaDelta/150703-AISight 
Active AI cores now provides camera coverage.
 2015-08-22 02:21:36 +09:30
Zuhayr
a234d8b096 Merge pull request #10022 from PsiOmegaDelta/150705-SecretAdminDatums 
Admin secret panel refactor.
 2015-08-22 02:18:39 +09:30
Zuhayr
c0d2dc8ac1 Merge pull request #10787 from Zuhayr/papershredders 
Added paper shredders from Minijar.
 2015-08-22 02:11:04 +09:30
Zuhayr
3bfa541612 Adds variables for CentComm, NanoTrasen and the station name. 2015-08-22 02:10:11 +09:30
Zuhayr
545e465dfc Added paper shredders from Minijar. 2015-08-22 02:00:08 +09:30
Zuhayr
6c27a8dd8d Merge pull request #9159 from Kelenius/ofClicksAndCooldowns 
Removes click cooldowns almost everywhere.
 2015-08-22 01:51:05 +09:30
Zuhayr
3632acd3db Merge pull request #10786 from PsiOmegaDelta/150821-SortedAccess 
Cleans out unused access definitions and sorts access lists.
 2015-08-22 01:34:08 +09:30
Zuhayr
b4b7719557 Merge pull request #9888 from Vivalas/dev 
[DEV] Re-adds the new uplink item
 2015-08-22 01:34:01 +09:30
Kelenius
c1a0661eba Accidentally commited before saving the file. 2015-08-21 16:19:09 +03:00
Kelenius
bed03443d1 Merge branch 'dev' into ofClicksAndCooldowns 
Conflicts:
	code/ZAS/Airflow.dm
	code/__defines/items_clothing.dm
 2015-08-21 16:15:07 +03:00
PsiOmegaDelta
56523d0941 Cleans out (mostly) unused access definitions and makes access lists sorted. 2015-08-21 14:45:45 +02:00
PsiOmegaDelta
742dde5c25 Gives the medical equipment access a name. 
Requires for guest passes to list the entry. Fixes  #10780.
 2015-08-21 14:01:29 +02: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
GinjaNinja32
c2cdf9d237 add round duration to status reply 2015-08-21 06:28:44 +01: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
PsiOmegaDelta
120ce3f20c Merge remote-tracking branch 'upstream/dev' into 150705-SecretAdminDatums 
Conflicts:
	code/modules/admin/topic.dm
 2015-08-20 14:16:35 +02: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