Commit Graph

118 Commits

Author SHA1 Message Date
Deelite34
e2bd916425 Fix typos
Fixes typos in baseball cap and searching for items under seat in space pod.
2020-07-02 23:09:40 +02:00
AffectedArc07
793f18c5e5 Fixes dupe processing 2020-05-28 15:16:53 +01:00
AffectedArc07
2d252f3b67 Annihilates the global iterator 2020-05-27 21:29:58 +01:00
AffectedArc07
928a8f0e04 Makes the code pass dreamchecker (#13161)
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
2020-04-11 15:59:16 -06:00
farie82
604daa05e1 Adds a new logging system and a logging view (#13115)
* Super early initial commit

* Why do I keep comitting this

* in between

* In between

* Sort fix. Transfer fix. HTML and more

* Scrolling + define values change

* Search fixes and time input fixes

* Minor tweaks. Fuel tank inclusion. Fixes

* derp

* Extra logging to fuel tank

* minor stuff

* add the message to admins for fueltanks

* Don't keep mob/atom references + fixes

* line fixes?

* Review improvements

* pois comment
2020-03-21 17:28:20 -06:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04:00
Citinited
fddff1049b [Testmerge ready] Ports tool behaviours; refactors all tools; adds functionality for self-filling reagent containers (#11700)
* Adds support for self-filling reagent containers

* Sets tool_behaviour on the default set of tools

* Fixing merge conflicts

* Refactors welder to use tool behaviour

* The refactor: part I

* The refactor: part II

* Tool Refactor Part III: Revenge of the Maint

* Tool Refactor Part IV: A New Hope

* Tool Refactor Part V: The Oldcoder Strikes Back

* Tool Refactor Part VI: Return of the Coder

* VII

* Holy shit, it compiles?!

* Nannek I completed your TODO, you owe me ice cream

* Tool helpers; telepad is compliant

* Bugtest, Round 1: Fight

Fuck refactoring disposals

* Buggfixing, Round 2: Electric Boogaloo

* Personal crafting uses tool behaviours now

* Construction datums use new tool behaviours; better way of handling fueltank refuelling; more bugfixing

* multitool_check_buffer change; removes some useless things in tool_helpers

* proc name change

* TRUE/FALSE changes

* Bugfixing, Round 3: A Good Day To Bugfix Hard

Fixes multiple issues raised by the testmerge

* Minor style changes
2020-02-15 13:31:08 -07:00
Fox McCloud
d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
Fox McCloud
67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Fox McCloud
9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
Fox McCloud
cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud
aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud
788f1926fb though-our-bodies-be-ravaged 2019-09-15 19:49:52 -04:00
Fox McCloud
ee0447dad6 Major Lavaland Update 2019-08-10 22:36:55 -04:00
Couls
e16b495170 More testmerge fixes and improvements
Shift middle click locks your direction again
Spacepods now move again(literally one letter fixed this)
Holster hotkey is back!(H to holster and unholster)
Hotkey Toggle button has been removed from the bottom bar and verbs
2019-07-09 07:59:12 -04:00
Arkatos1
fdd2ca94d4 added get_cell() proc to remaining items using cells 2019-05-18 23:52:18 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Aurorablade
4fc35a68b1 Gonna have to clean some files after this. 2019-01-19 22:38:47 -05:00
tigercat2000
e56750481c Multilingualism
This commit adjusts the speech parsing system to allow for an infinite
number of languages to be present in the same message. You can
transition freely between any language you are able to speak simply by
putting it's language key in the middle of the sentence.

Honestly, this was a massive pain in the ass, and there's probably still
broken stuff, even though I've spent around 8 hours testing and refining
this.
2018-11-24 00:22:05 -08:00
joep van der velden
07e419a8a4 Items dropped in a pod will now stay in the pod. 2018-10-29 20:31:11 +01:00
Ty-Omaha
ffe39f4500 hostile mob fix v2 2018-10-28 03:56:02 -04:00
Certhic
a082e76838 fixes animals attacking while on help intent 2018-10-27 13:52:20 +02:00
Birdtalon
8e0700f987 numbers round the wrong way 2018-10-20 11:05:53 +01:00
Birdtalon
d16dd85def significantly reduces explosion from spacepods 2018-10-19 19:28:04 +01:00
variableundefined
4de5284557 Merge pull request #9677 from DesolateG/global
Updates global lists to the global var subsystem.
2018-10-12 13:18:28 +08:00
variableundefined
6b1b38d4f1 Port over tg ore stack and stack merging
Meta

Birbfix

Maxi

Re-add automatic satchel ore pickup (oops)

Mecha formatting

re
2018-10-09 10:06:03 +08:00
Desolate
c974e29a3c global lists global defined 2018-10-02 15:52:46 -05:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Crazy Lemon
c9fb3a22f7 Merge pull request #9165 from alexkar598/nerfs-the-pods
Pods are no longer miniguns
2018-07-11 13:56:55 -07:00
alexkar598
ba9646fa16 Update equipment.dm 2018-07-03 05:30:40 -04:00
MINIMAN10000
17a4d52101 not do_after, not equal concious, warn pilot if there is one 2018-07-02 11:09:35 -07:00
alexkar598
05674ccc00 Update equipment.dm 2018-07-02 07:28:30 -04:00
alexkar598
5ae7032120 Update equipment.dm 2018-07-02 07:22:43 -04:00
MINIMAN10000
288c16df1b Restrained spacepod passanger can now exit pod after 2 minutes 2018-07-02 00:38:06 -07:00
Kyep
c03a921308 squash 2018-06-17 07:54:17 -07:00
Kyep
8ba5bdd276 syndi pod desc tweak 2018-06-17 00:42:42 -07:00
Kyep
4d4eb16a3a fixes merge conflict 2018-06-06 16:32:31 -07:00
tigercat2000
5ace5944d9 Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings 2018-05-31 19:34:47 -07:00
Kyep
08fdc2bce3 merge conflict fix 2018-04-25 23:48:44 -07:00
Fox McCloud
8c7b543415 The Great Conflictening 2.0: Removes /obj/item/device 2018-04-25 23:07:35 -04:00
Fox McCloud
49fcd92040 pod fabricator 2018-04-22 18:23:27 -04:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Kyep
1b6b1deecc fixes merge conflict in custom_grenades.dm 2018-04-01 18:59:25 -07:00
Fox McCloud
96fc4aba1c Merge pull request #8671 from Aurorablade/PodFluff
Fluff Item: Decemviri
2018-03-12 15:58:39 -04:00
Kyep
5f2ef09a13 fixes merge conflict with bureaucracy.dmi 2018-03-01 19:12:10 -08:00
florodude
4376f8f974 fixes #8680
Changed frabricated to fabricated.
2018-02-15 00:05:36 -06:00
Aurorablade
11872315ee tiger changes 2018-02-10 00:45:55 -05:00
Aurorablade
3bdecb4e54 spacepodfluff 2018-02-09 22:34:17 -05:00
Mars
74ae208bf6 Better wording+span ending
Added a few missing </span> and rewording of the application of the pod
lock buster on a locked pod without lock, and trying to lock a pod
without a locking system.
2018-01-24 22:09:53 +01:00
Mars
66838caa8b Fixes pod lock buster and locking without locks
Ensures pods are only locked when there is a pod lock, and let's pod
lock busters unlock the pod, and not jusre destroy a lock. Also minor
typo correction and replacing a 1 used as boolean with TRUE
2018-01-23 20:01:37 +01:00