Commit Graph

17 Commits

Author SHA1 Message Date
silicons 147903f654 sigh 2021-09-19 10:57:58 -07:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
Cirno 020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Slignerd fa81e27676 d (#36046)
Dice icon name and desc change
2018-03-03 00:31:35 -06:00
CitadelStationBot e0ab141341 [MIRROR] Updates die to use the roll() proc + initialize() (#5480)
* Merge pull request #35564 from praisenarsie/patch-29

Updates die to use the roll() proc + initialize()

* Updates die to use the roll() proc + initialize()
2018-02-14 10:54:58 -06:00
Emmett Gaines f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
coiax 9d59e36289 Add caltrop component for spikey floor objects (#33280)
* Add caltrop component for spikey floor objects

The caltrop component now can be added to any crossable atom, and it'll
act like a shard of glass, or a d4. Additional flags are possible for it
to bypass shoes or ignore people who are walking.

This means d4 don't reimplement shard logic, and also open the window
for caltrop grenades later.

Also, it taught me how components work.

* Code review I

* Caltrop damage is 4

* Cactus hurts

* Whoops

* Ignore restraints = true
2017-12-10 10:32:03 -06:00
Jordan Brown 70be12aa1c Merge pull request #33241 from swindly/suicide
Adds some suicide acts
2017-12-09 15:52:53 -06:00
Poojawa b6fdbb54f5 Update dice.dm 2017-09-19 06:35:36 -05:00
Robustin 422373e649 Dice will now roll when thrown 2017-09-16 11:37:38 -05:00
kevinz000 c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
2017-08-24 21:07:58 -07:00