Commit Graph

80 Commits

Author SHA1 Message Date
SandPoot
54641ce201 send 2023-01-23 20:44:28 -03:00
keronshb
3ea22f97a6 Merge remote-tracking branch 'upstream/master' into ambitioncheck 2022-02-22 17:10:25 -05:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
LetterN
958b0ef583 dupe defines bad 2022-01-11 10:01:35 +08:00
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401)
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
2021-12-30 07:40:15 +01:00
keronshb
83a62ace04 Ambitioncheck 2021-12-23 21:15:31 -05:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb
659d7aa715 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-11 19:35:40 -05:00
silicons
c11d769388 Update _lists.dm 2021-11-09 20:17:34 -07:00
LetterN
99019166e4 i think it works
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
keronshb
bd7a2b6a2a Lets families compile 2021-10-12 16:12:38 -04:00
keronshb
4eaeccf8d8 Fixes more errors 2021-09-15 15:25:26 -04:00
keronshb
c7d1c9d8e8 Ports Stripping log when dc'd 2021-07-07 21:12:44 -04:00
Fabian
63d910c79c Merge branch 'master' into the-fuck-am-i-doing 2021-05-05 17:26:41 +02:00
silicons
ef2482c6b0 renders storage objects independently per user (#14545)
* sigh

* sigh

* override

* hah..

* kinda working

* done
2021-04-13 15:16:21 +02:00
Fabian
7e50d878ca Merge branch 'master' into the-fuck-am-i-doing 2021-03-15 14:09:30 +01:00
Fabian
8178b7073a It's done, atleast the code is 2021-03-05 21:50:29 +01:00
Fabian
2f1aba4f80 Revert "i can't believe kevin made me code"
This reverts commit 7f38564838.
2021-03-05 21:19:59 +01:00
Fabian
7f38564838 i can't believe kevin made me code
im taking severe offense to this
2021-03-05 19:55:53 +01:00
silicons
63ce4ffed6 Update _lists.dm 2021-02-24 17:45:49 -07:00
silicons
d28411b4a3 Update _lists.dm 2021-02-13 20:31:34 -07:00
silicons
6941f2a183 woops 2021-02-13 20:01:48 -07:00
silicons
4a0adc49f6 mod 2021-02-13 20:00:28 -07:00
MrJWhit
c642f77c81 Weeeeeeee 2021-01-22 19:49:04 -05:00
Letter N
cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
Putnam
6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
silicons
a8f920f88c Update _lists.dm 2020-08-29 22:48:26 -07:00
Ghommie
949e8f6b3a WIP 2020-05-30 21:53:14 +02:00
Ghom
68cd016067 Demodularizing wishgranter, some helpers, and removing unused files. (#12291) 2020-05-17 17:06:05 -07:00
kevinz000
616d104c23 Merge pull request #12189 from Ghommie/Ghommie-cit735
Skill modifier datums.
2020-05-14 04:46:24 -07:00
Ghommie
300331ccb7 Skill modifiers datum WIP. 2020-05-10 02:11:48 +02:00
Ghommie
a194d7dafe merge conflict and job/dept discounts support. 2020-05-03 02:11:05 +02:00
kevinz000
4689e2aeb6 Merge pull request #11980 from Ghommie/Ghommie-cit700
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Ghommie
de531bd047 porting CEV-Eris pickweight procs. 2020-04-23 21:47:54 +02:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
Ghommie
0816512150 more work. 2020-04-13 16:09:52 +02:00
Ghommie
97315940fe Polychromic element. 2020-03-08 01:01:21 +01:00
Ghom
c0d4c30711 Update _lists.dm 2020-03-03 14:57:32 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
02e8a73265 Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
2019-11-14 16:45:09 -07:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01:00
Ghommie
b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
kevinz000
e55da2f958 BYOND 513 2019-10-27 16:28:21 -07:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
Poojawa
0e510e8c34 HELPERS 2018-09-11 00:54:07 -05:00
Jordan Brown
888b04427c Merge pull request #38683 from AnturK/anomalyfix
Fixes anomaly area selection.
2018-06-25 09:18:40 -05:00
deathride58
2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00