variableundefined
5ca3a34d3b
Merge pull request #16720 from Qwertytoforty/grabbing-your-attention
...
Makes revive, biodegrade, and freedom break grabs
2021-09-17 22:12:08 -05:00
variableundefined
fa3fa1dc6a
Merge pull request #16579 from FlattestGuitar/armor-defines
...
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
variableundefined
454ce66eea
Merge pull request #16679 from SabreML/progress-bar-HUD-layer
...
Makes progress bars render above the game HUD
2021-09-17 21:15:16 -05:00
Qwertytoforty
4a4522641f
Removes uneeded procs, updates ability desc
2021-09-16 13:17:26 -04:00
variableundefined
2e98227daa
Merge pull request #16489 from E-MonaRhg/departmental-clothing-vendors
...
Departmental clothing vendors (vendors only, no map edits)
2021-09-11 14:11:03 -05:00
variableundefined
a118dd1308
Merge pull request #16491 from shmabuu/Clown/Mime-Mech-Fix
...
HONK Mech and Reticence Mech Fix
2021-09-11 13:45:09 -05:00
E-MonaRhg
f4e58a0961
Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors
2021-09-11 20:26:54 +02:00
SabreML
eacc7a52de
do_after() progress bar HUD layering
2021-09-11 01:36:47 +01:00
AffectedArc07
b0e9db64bd
Revert "Merge pull request #16520 from SabreML/fix-bundle-4"
...
This reverts commit 9a62622fbc841ad0f1fd
2021-09-07 16:16:40 +01:00
variableundefined
9a62622fbc
Merge pull request #16520 from SabreML/fix-bundle-4
...
Fix bundle #4
2021-09-06 22:29:10 -05:00
variableundefined
841ad0f1fd
Merge pull request #16609 from SabreML/GC-fixes-1
...
GC fix bundle #1
2021-09-06 22:15:44 -05:00
E-MonaRhg
a99fc879df
Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors
2021-09-06 19:32:39 +02:00
SabreML
c122e67693
Merge remote-tracking branch 'upstream/master' into fix-bundle-4
2021-09-02 17:48:42 +01:00
variableundefined
936fbf3194
Merge pull request #16601 from Qwertytoforty/wii-sports-annoucer
...
Adds antimatter sniper rounds, buffs bleeding rounds, nerfs base sniper rounds
2021-09-01 19:46:04 -05:00
variableundefined
188496c678
Merge pull request #16595 from SabreML/clothing-migration
...
[IDB IGNORE] Clothing .dmi file organisation
2021-09-01 19:44:59 -05:00
variableundefined
abe072f936
Merge pull request #16596 from S34NW/right-click-rearrange
...
Makes admin verbs easier to see on the context menu
2021-09-01 19:43:56 -05:00
SabreML
f66bcbba38
Material Container
2021-08-28 21:04:50 +01:00
Qwertytoforty
137b11924e
An to A
2021-08-28 15:01:32 -04:00
Qwertytoforty
e9e7522076
Adds antimatter sniper rounds, changes variables around
2021-08-26 17:05:21 -04:00
TheYeetster1
422e033d59
Adds 3 new names when a hardhat is put on a corgi ( #16553 )
...
* Hardhats
* Fixes relative path
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2021-08-25 15:57:16 +01:00
S34N
7188e92123
wall jaunting begone ( #16591 )
2021-08-25 15:37:30 +01:00
Farie82
4273a7db49
Butterflies created from severe anxiety decompose ( #16594 )
...
* Butterflies created from severe anxiety decompose
* Remove useless return
* Update code/datums/diseases/anxiety.dm
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
2021-08-25 15:30:48 +01:00
S34NW
603ad19634
Groups and makes admin verbs easier to read
2021-08-24 22:29:07 +01:00
SabreML
6648d3131f
Clothing Organisation V1
2021-08-24 18:37:48 +01:00
S34N
334bab4af1
Fixes runtimes in spell can_cast() checks. ( #16592 )
...
* fixes null locs like disposals causing runtimes
* Update code/datums/spell.dm
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
2021-08-24 14:24:09 +01:00
Mieszko Jędrzejczak
00dedfe6a9
Swiftly sanction Sabre's systematic suggestions
...
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
2021-08-21 12:57:24 +02:00
Mieszko Jedrzejczak
1465a7de14
magic damage flag
2021-08-20 22:18:26 +02:00
Mieszko Jedrzejczak
559fa37756
add defines for damage flags
2021-08-20 21:09:21 +02:00
E-MonaRhg
566b246a24
Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors
2021-08-16 21:32:35 +02:00
chafla
50a90d2767
Merge branch 'master' into ghost-rad-hud
2021-08-14 17:28:16 -07:00
E-MonaRhg
c895e47ccb
Merge remote-tracking branch 'upstream/master' into departmental-clothing-vendors
2021-08-13 19:26:44 +02:00
SabreML
301ee25b23
Progress bar layering over the HUD
2021-08-11 15:52:22 +01:00
Matt
68b4faf763
Merge branch 'master' into ghost-rad-hud
2021-08-10 11:14:35 -07:00
shmabuu
27eed79e69
Clown/Mime Mech Fix
2021-08-06 22:08:43 -07:00
S34NW
fa88d21ae4
Merge branch 'master' into solgov_ERT
2021-08-06 15:47:40 +01:00
E-MonaRhg
ecd50aaf71
Suggested stuff + security bomber jacket and renamed hard hats
2021-08-06 14:50:11 +02:00
E-MonaRhg
c652bbfa10
Initial departmental clothing vendors commit
2021-08-05 22:01:05 +02:00
SabreML
02fe0876f5
Fix bundle #3 ( #16411 )
...
* Explosive implant
* Package wrapper
* Venus human trap sprites
* Vine damage
* Wisp vision
* Display case
* Storage viewing
* Ghost poll nullspacing
* Inflatable barrier piercing
* Pneumatic cannon
* Cow grammar
* Centcom jaunting
* Consistency
Not actually a lazy list, as far as I can tell
* Review 1
Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Review 2
Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* length()
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2021-08-05 11:04:27 +01:00
AffectedArc07
e46f67810a
Cleans up the TODOs I left all over the codebase ( #16443 )
...
* Removes command_name() proc
* Removes GLOB.teleportlocs + GLOB.ghostteleportlocs
* Clean up IPIntel
* Tweaks karma logging
* Tweaks time
2021-07-28 13:45:18 -04:00
dearmochi
c95f566cd1
Custom emotes display on runechat ( #16355 )
...
* Custom emotes display on runechat
* document symbol arg
* Update code/__DEFINES/misc.dm
2021-07-28 10:06:43 +01:00
Fox McCloud
cfde082a10
Merge pull request #15807 from hal9000PR/TG-carp-2-electric-boogaloo
...
Ports TG sleeping carp, the second.
2021-07-27 13:21:41 -04:00
AffectedArc07
fad93ed2e4
Revert "uh oh that guy is glowing green ( #16435 )"
...
This reverts commit 076e807731
2021-07-27 12:54:33 +01:00
S34N
076e807731
uh oh that guy is glowing green ( #16435 )
2021-07-27 10:46:26 +01:00
variableundefined
7912fae83b
Merge pull request #15354 from Qwertytoforty/My-turn-to-try
...
Adds a heal point system to the rod of Asclupius
2021-07-26 13:57:28 -04:00
Qwertytoforty
076cbba3c4
Aaaand extra brackets I forgot
2021-07-26 13:51:57 -04:00
Qwertytoforty
2eb5e26aba
Final changes
2021-07-26 13:50:33 -04:00
Qwertytoforty
2523dc90bc
Update code/datums/status_effects/buffs.dm
...
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com >
2021-07-26 13:47:06 -04:00
variableundefined
b9aa1facce
Merge pull request #15757 from warior4356/holy-chapel
...
Makes the chapel holy once more.
2021-07-25 08:37:18 -04:00
variableundefined
d91c8ba479
Merge pull request #15980 from AffectedArc07/toml-config
...
[READY] Converts configs to use TOML + Configuration refactor
2021-07-25 08:26:29 -04:00
datlo
daf2453d15
Add new lawsets and reorganise AI upload, the Third ( #15743 )
...
* lawsets update
* Revert "lawsets update"
This reverts commit a68ddcb9ee06sean@gmail.com >
* Update hippocratic per review
Co-authored-by: Sean Williams <06sean@gmail.com >
* Update hippocratic per review
Co-authored-by: Sean Williams <06sean@gmail.com >
* Fix merge conflict
* Update code/game/objects/items/weapons/AI_modules.dm
Co-authored-by: dearmochi <shenesis@gmail.com >
* Add a pilot seat to the ERT shuttle
* Revert "Add a pilot seat to the ERT shuttle"
This reverts commit 676bfa7d0325063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: Sean Williams <06sean@gmail.com >
Co-authored-by: dearmochi <shenesis@gmail.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
2021-07-25 10:19:58 +01:00
