Commit Graph

17612 Commits

Author SHA1 Message Date
Timothy Teakettle b76cf0004b ui adjustment 2020-08-28 18:34:00 +01:00
Timothy Teakettle 1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
Putnam c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07:00
raspy-on-osu d116dd49b2 teg tweak 2020-08-27 23:04:00 -04:00
lolman360 c2ded74d6a e 2020-08-28 12:54:58 +10:00
Timothy Teakettle b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
Timothy Teakettle 398692df0b emotes 2020-08-27 20:24:37 +01:00
Lynxless 4caeb310f7 Added blank line to the end of files 2020-08-27 15:59:07 -03:00
Lynxless 828a65a7fd New branch test 2020-08-27 15:46:40 -03:00
Chiirno fdc2cea077 added chem dispenser, time for errors 2020-08-27 14:27:35 -03:00
silicons b162d8184d Merge pull request #13237 from Hatterhat/pda-bomb-limited
pda bomb buyonce
2020-08-27 10:07:05 -07:00
Timothy Teakettle fe25046410 Merge branch 'master' into limbs 2020-08-27 18:06:35 +01:00
silicons 2bc92145df Merge pull request #13256 from EmeraldSundisk/coglox
Expands CogStation's airlocks, among other things.
2020-08-27 10:03:33 -07:00
silicons 734ed238b7 Merge pull request #13257 from timothyteakettle/so-ya-like-qol-huh
qol: customization features appear in alphabetical order
2020-08-27 10:03:15 -07:00
Timothy Teakettle bc2c658395 json 2020-08-27 18:01:08 +01:00
silicons 857c581931 Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
silicons ec9b82381b Merge pull request #13265 from timothyteakettle/rock-paper-scissors
adds rock paper scissors
2020-08-27 09:42:08 -07:00
silicons cf85d68ec2 Update eyes.dm 2020-08-27 09:39:27 -07:00
silicons 0351686399 Update eyes.dm 2020-08-27 09:38:39 -07:00
Detective-Google 9f7a358bb9 plasmamen are playable now 2020-08-27 11:37:13 -05:00
lolman360 54c32f9162 Update smithed_items.dm 2020-08-27 17:43:46 +10:00
Trilbyspaceclone c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
raspy-on-osu 172fe663c3 remove redundant separate tesla log and merge it into the singulo log
also formatting because i hate inconsistent whitespace
2020-08-27 02:46:19 -04:00
raspy-on-osu 350a99a4ba teslas now fizzle at 0 energy and adds admin log for fizzles
fixing the tesla engine 100% speedrun world record
2020-08-27 02:39:09 -04:00
raspy-on-osu 68cb78ba51 why is this here
no really how the fuck did this happen
2020-08-27 00:03:58 -04:00
raspy-on-osu 7840205d4e shuffle containment checking for optimization
now it should be checking less (tested, functionally identical to before)
2020-08-26 23:59:15 -04:00
lolman360 a988dcce73 better 2020-08-27 12:02:18 +10:00
lolman360 408babe0dc Math 2020-08-27 12:00:11 +10:00
raspy-on-osu f3990732f3 remove excess whitespace
title
2020-08-26 21:25:45 -04:00
raspy-on-osu 6fc019ebf8 create unique containment check for the tesla
it now functions as normal. it only checks for containment in a 10 tile radius (this should work fine for the default setups of Delta and Lambda).
2020-08-26 21:20:23 -04:00
timothyteakettle 8d6a026153 yep 2020-08-27 00:01:54 +01:00
silicons c264d90140 Update eyes.dm (#13254) 2020-08-26 18:00:27 +02:00
silicons ff6beea525 rebalances shotgun shell stripper clips since no one else wants to (#13116)
* Update volumetrics.dm

* Update ammo_boxes.dm
2020-08-26 17:19:29 +02:00
silicons 1b30adbf2a Update robot.dm (#13247) 2020-08-26 14:14:33 +02:00
Timothy Teakettle d877a8c0fb qol (#13250) 2020-08-26 14:14:19 +02:00
Ghommie 2811f744e3 Fixing some mistakes with the priority overlays removal PR. 2020-08-26 14:00:35 +02:00
silicons f611fee193 mecha are no longer immune to goliath tentacles (#13172)
* Update goliath.dm

* Update goliath.dm

* Update goliath.dm
2020-08-26 13:06:53 +02:00
Letter N 57a008d567 fixes adminbus 2020-08-26 11:22:57 +08:00
timothyteakettle 5cf06be877 cancel on move 2020-08-26 01:09:51 +01:00
timothyteakettle f908475617 rock paper scissors 2020-08-26 01:01:09 +01:00
silicons 9d0fafd09e Update ventcrawling.dm (#13061) 2020-08-25 23:08:34 +02:00
silicons 1608214156 gives vortex blasts 50% armor pen vs mechas (#13171)
* Update hierophant.dm

* Update hierophant.dm

* Update hierophant.dm
2020-08-25 22:17:36 +02:00
silicons 973839dee4 ports my baystruments updates from tg (#13219)
* subsystem

* fix

* e

* update

* fix
2020-08-25 21:04:42 +02:00
silicons 8699ce2174 fixes a bunch of broken clickdelays (#13218)
* fixes

* fix
2020-08-25 20:58:20 +02:00
silicons 9ac429fb8d Merge pull request #13132 from ancientpower/newscaster-fix
Ghosts can read newscasters by clicking on them
2020-08-25 09:06:46 -07:00
Timothy Teakettle 5a33c049a7 wops 2020-08-25 16:59:26 +01:00
Timothy Teakettle 2fa40f588e let them stand 2020-08-25 15:26:03 +01:00
Timothy Teakettle 79fa9277a3 yes 2020-08-25 15:23:11 +01:00
lolman360 2b057b2483 reverti9es 2020-08-25 19:03:04 +10:00
lolman360 43af265037 Update finished_items.dm 2020-08-25 19:01:24 +10:00