Commit Graph

109 Commits

Author SHA1 Message Date
Ghom
ce1f1bdf5e Turning a few components into elements. (#12325)
* Turning a few components into elements.

* eh
2020-05-24 13:06:27 -07:00
Ghommie
643ef48f0e Macros, generic skill implementations. 2020-05-05 04:42:34 +02:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
kevinz000
d3724d5fbd f 2020-03-16 10:59:34 -07:00
kevinz000
6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000
a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000
763c835a53 bitflags not equals 2020-03-16 04:26:19 -07:00
kevinz000
d32bff7815 return list 2020-03-16 03:35:10 -07:00
kevinz000
09e1be9651 block args 2020-03-16 03:32:12 -07:00
kevinz000
703fca5f90 add owner argument 2020-03-16 03:24:19 -07:00
kevinz000
9ead492bb0 changes 2020-03-16 00:28:18 -07:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghommie
c19549c7f9 Something about a couple stack trace issues. 2020-02-10 14:51:05 +01:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie
81b5fe2de3 Further buff and fix for clown ops tearstache nade. 2020-02-03 07:08:47 +01:00
Ghommie
07b6d278a1 fixed and brutalized clown op slippery weapons a little. 2020-02-01 04:48:40 +01:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
kevinz000
b1cd0f4ede Update grenade.dm 2020-01-19 16:11:49 -07:00
kevinz000
90fcedd188 Update grenade.dm 2020-01-19 13:40:09 -07:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kappa-sama
3e199ed780 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer 2020-01-12 14:23:38 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kappa-sama
bfedc80c64 idk what this even is lmao 2020-01-10 22:39:45 -05:00
Seris02
29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02
0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Linzolle
d0263fc669 don't act on non mobs 2020-01-03 18:21:08 -06:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
kevinz000
8aca8b8f25 thank you based ghomtainer (when) 2x how did i not notice this 2019-12-19 04:00:37 -07:00
kevinz000
9436d218b4 thank you based ghomtainer (when)
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2019-12-19 03:59:57 -07:00
kevinz000
eee52655ef Update flashbang.dm 2019-12-19 01:57:28 -07:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
kevinz000
5c8471808c Update plastic.dm 2019-09-28 20:44:29 -07:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
kevinz000
0d43cac0e6 Update grenade.dm 2019-02-22 06:02:55 -08:00
kevinz000
12eac8f625 Update grenade.dm 2019-02-18 16:39:43 -08:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
deathride58
695bbef473 makes spears require priming to explode on throw, makes it possible to rip embedded objects out instantly by pressing resist if the item is normal sized or larger (#7450) 2018-08-23 00:30:33 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
kevinz000
b806ee92f3 Merge branch 'master' into upstream-merge-30862 2018-06-17 20:04:06 -07:00
kevinz000
6a8f029e30 Update flashbang.dm 2018-06-17 20:02:49 -07:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -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
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
Jordan Brown
0d08eca330 Merge pull request #37956 from ShizCalev/chem-grenade-cleanup
Cleans up duplicate get_area's in c.grenade priming
2018-05-21 16:35:54 -05:00