Commit Graph

12166 Commits

Author SHA1 Message Date
ShizCalev
38edbe0269 Merge pull request #52416 from MrMelbert/testedCode
Fixes cyborg cycling (and a runtime with uneq_active)
2020-07-23 06:40:39 -04:00
Useroth
2b61b2f785 Merge pull request #28 from Skyrat-SS13/upstream-merge-52341
[MIRROR] Removes forcesay on attacked
2020-07-22 14:21:12 +02:00
skoglol
f5cd45f7f7 Removes forcesay on attack (#52341) 2020-07-22 04:30:30 -04:00
tralezab
832f8b8bb5 [READY] Mafia Additional Roles and Generic Randomized Setup (#52083)
* new roles

* Madness rename

* hop judgement override

* hop vote fixed, travis happy

* hop fixed

* Update code/modules/mafia/_defines.dm

Co-authored-by: Fikou <piotrbryla@onet.pl>

* highly experimental random setup system

* hop cannot reveal before any voting is possible, lmao

* this shit actually works lmfao

* removes forced_setup, nightmare detection immune

* whoop

* removes setups!

* OK, finally kind of done with all this minus the incoming reviews

* adds hop's ability to their text, removes old var

* bundle?

* Update tgui.bundle.js

* role fixes (roleblock not working on a few)

* eep

* fuck

* potato's review

* Update tgui.bundle.js

* ffff

* bundle

* rohesie's review

* eureka

* updates doc, removes debug stuff

Co-authored-by: Fikou <piotrbryla@onet.pl>
2020-07-21 23:29:53 -04:00
skoglol
7565f1a9b5 Can no longer slimelink from a corpse (#52342) 2020-07-21 19:38:55 +02:00
AnturK
4e1f0c9664 Smoothing cleanup, variables moved, atom movable three Destroy() merged into one (#51878)
* smooth

* derp

* parent call order

* defined

* merge stuff

* tab

* merge conflicts

* call parent first
2020-07-21 19:28:06 +02:00
skoglol
f42a55d976 Merge pull request #52301 from ShizCalev/more-mulebot-fixes
More mulebot fixes
2020-07-21 19:27:45 +02:00
skoglol
dc056ea934 Merge pull request #52305 from ShizCalev/lighteater-fix
Makes the light eater eat even more lights.
2020-07-21 19:24:16 +02:00
skoglol
92f38dc753 Merge pull request #52316 from Couls/givefeedback
Tell the giver when someone takes the item you're offering
2020-07-21 19:22:09 +02:00
skoglol
44c6a265f6 Merge pull request #52331 from Winterous/Medbot_patch
Medbot text changes fixed for real this time.
2020-07-21 14:27:52 +02:00
ShizCalev
4b6500fb67 Makes all anchored changes use setAnchored(), COMSIG_MOVABLE_SETANCHORED now only sent if an AM's anchored var has changed for more reliable usage. (#52254)
* Converts everything to use setAnchored() + other fixes

* Fixed singulo debug

* singulo again

* forgot to move the vv_edit proc

* caught that this time :)

* changes

* Update code/game/atoms_movable.dm

Co-authored-by: Rohesie <rohesie@gmail.com>

Co-authored-by: Rohesie <rohesie@gmail.com>
2020-07-21 02:20:26 -03:00
MrMelbert
7c845d0ca0 Refactors some borg inventory code and removes a bunch of unused references to borgs taking oxy/tox damage (#52265)
* Removing a bunch of oxygen stuff

* breaking works

* completely functional yes

* reverts some old changes

* thanks based shiz

* i said 'thanks' god damn it

* oops

* another one bites the dust

* they told me math was of variable difficulty
2020-07-20 22:39:32 -03:00
skoglol
8f7bcf424f Runechat emotes (#52212)
* runechat emotes

* rename

* tweaks
2020-07-20 22:03:30 +02:00
Dennok
e54ac594de look_up tweak and look_down verb (#52139)
* look_down

look_down 
persistent  look_up and look_down

* look_down

look_down 
persistent  look_up and look_down

* Now look prefer a hole in front of the astronauts

* up

* up

* up

* up

* Update living.dm

* Update living.dm
2020-07-20 16:12:19 -03:00
L
c55025a50f rename 2020-07-19 22:11:44 -03:00
L
9ee2907a68 runechat emotes 2020-07-19 22:11:44 -03:00
Winterous
68eee355b1 capitalisation reee 2020-07-19 17:09:31 +10:00
Winterous
4d5887dee7 fiiiix 2020-07-19 16:57:31 +10:00
Winterous
23f1bfcddc Medbot 2020-07-19 16:39:20 +10:00
ラッピ from PSO2
d744aec5d0 Update species.dm (#52319) 2020-07-18 21:38:32 +02:00
ラッピ from PSO2
2b03ca5a04 click this commit (#52292)
![](https://media1.tenor.com/images/1f11d49fe9743e638565a039232f9c7a/tenor.gif?itemid=7290429)
2020-07-18 15:10:03 -03:00
Coul
a3c1c56083 Clean up spans and visible message when someone takes an item you're offering 2020-07-18 14:03:51 -04:00
carshalash
2d39a0c94d Return of modules to AI shell names (#51914)
* Update robot.dm

* Update say.dm

* reeeee didnt work
2020-07-18 13:32:11 -04:00
LemonInTheDark
d3f9b70c0f Adds a message modification packet to saycode to allow for unordered parsing of operator chars, like ;, #, :, or % (#51790) 2020-07-18 18:18:23 +02:00
Ryll Ryll
53d1f1477d Adds hauberoaches, cockroaches wearing spiked helmets (#52161)
* done in under an hour

* sprite
2020-07-18 12:53:45 +02:00
ShizCalev
fc663c3aab lil cleaner 2020-07-18 00:20:39 -04:00
ShizCalev
108f1c9bce Makes the light eater eat even more lights. 2020-07-17 20:58:35 -04:00
ShizCalev
8c4ad654f1 cleanup 2020-07-17 18:05:14 -04:00
ShizCalev
075d0a0c12 More mulebot fixes 2020-07-17 17:30:09 -04:00
Ryll-Ryll
40c1b51b97 dunno what to rename this 2020-07-16 21:53:56 -04:00
Ryll-Ryll
1f31064c3e Merge remote-tracking branch 'tgstation/master' into who-named-this-damned-proc 2020-07-16 21:43:14 -04:00
Aleksej Komarov
0cf00a2645 tgui 4.0 (#52085)
* tgui 4.0 hyper squash

* Upgrade dependencies
2020-07-16 20:13:04 +02:00
L
84c44bc03c defined 2020-07-16 11:14:46 -03:00
jdawg1290
62676e72a8 Force LF line endings with gitattributes and convert repo (#52266)
Co-authored-by: Aleksej Komarov <stylemistake@gmail.com>
2020-07-16 03:02:40 +03:00
ShizCalev
254536072e [s] sanity checks vv_edit_var() values (#52255)
cl ShizCalev
fix: Added some sanity checking for varedit values.
/cl
* sanity checks vv_edit_var() values

* this should be an or

* one more fix
2020-07-16 10:20:41 +12:00
oranges
88170c9e4c Simple mob AI wakes up less (#52228)
There's no reason to wake every mob on the Z level when we can simply
wake up only those nearest to the mob

In theory we could even not do this at all, but there would be a few
seconds delay before the idle automated actions ran and the AI wokeup
anyway
2020-07-15 22:31:26 +08:00
ATH1909
5cce5f87bd Finally adds a quickdraw hotkey for the suit storage slot (#52040) 2020-07-14 20:18:18 -04:00
ShizCalev
99d4fe86c5 Fixes throw mode hud icon not updating while mob is clientless (#52192) 2020-07-14 20:16:02 -04:00
ShizCalev
b3fa367ac7 Fixes cameramob ghostize runtime (#52197) 2020-07-14 20:14:08 -04:00
ShizCalev
fbcb610d18 Fixes ice demon teleport runtime (#52200) 2020-07-14 20:13:30 -04:00
LemonInTheDark
dbdb2d33fe Merge conflict begone 2020-07-12 17:37:14 -07:00
skoglol
3c30af5ddc Merge pull request #52020 from Ryll-Ryll/cronch
[READY] Vendors can tip on people thrown at them extra hard, lets you set ejection speed on disposal outlets
2020-07-12 13:59:38 +02:00
skoglol
ad37765b04 Merge pull request #51963 from Maurukas/wingreconstruction
Reconstructive surgery for moth wings
2020-07-12 13:43:52 +02:00
ShizCalev
cc7851b662 Fixes plasmamen racial ignitation stuff ignoring fireproofing traits (#52039)
* Fixes plasmamen ignoring fireproofing traits

* fixes drunk code
2020-07-12 13:27:11 +02:00
tralezab
47c6ff7b7f Mafia Map Fixes and Removal (#52066)
* map fixes 😋

* removes necro for the time being

* lavaburn gone from update_fire code

* trait system (pog)

* small fix :)
2020-07-12 13:26:29 +02:00
skoglol
7ec3849d63 Merge pull request #52158 from LemonInTheDark/help-me
Fixes acid/fire/blobs/a few other things touching objects below a tile
2020-07-12 11:56:26 +02:00
skoglol
e7643a8350 Merge pull request #52156 from Ryll-Ryll/tip-fix2
Fixes tipped player medbots never being able to walk again
2020-07-12 11:40:55 +02:00
Ryll-Ryll
6506b72d1e capital 2020-07-11 23:42:26 -04:00
Ryll-Ryll
0115ce25d6 update this too 2020-07-11 23:34:43 -04:00
Ryll-Ryll
7f15be7f68 Merge branch 'master' into who-named-this-damned-proc 2020-07-11 23:30:49 -04:00