Jordan Brown
26b6fab1fe
Merge branch 'pr-38604'
...
Signed-off-by: Jordan Brown <Cyberboss@users.noreply.github.com >
2018-06-28 14:22:03 -04:00
Dax Dupont
278f4d7429
anal
2018-06-26 23:46:15 +02:00
Dax Dupont
63b0e46a63
Wat zullen we drinken Zeven dagen lang Wat zullen we drinken, wat een dorst Wat zullen we drinken Zeven dagen lang Wat zullen we drinken, wat een dorst Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Dan zullen we werken Zeven dagen lang Dan zullen we werken, voor elkaar Dan zullen we werken Zeven dagen lang Ja zullen we werken, voor elkaar Dan is er werk voor iedereen Dus werken we samen Zeven dagen lang Ja werken we samen, niet alleen Dan is er werk voor iedereen Dus werken we samen Zeven dagen lang Ja werken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Eerst moeten we vechten Niemand weet hoe lang Eerst moeten we vechten, voor ons belang Eerst moeten we vechten Niemand weet hoe lang Eerst moeten we vechten, voor ons belang Voor het geluk van iedereen Dus vechten we samen Samen staan we sterk Ja vechten we samen, niet alleen Voor het geluk van iedereen Dus vechten we samen Samen staan we sterk Ja vechten we samen, niet alleen
2018-06-24 14:45:07 +02:00
ShizCalev
ff532a4ca4
Spellchecks TGStation
2018-06-19 18:57:44 -04:00
Jordan Brown
cf7e8aa9ec
Qdels queries, adds sleep safety checks, DBcore checks for leaks ( #38363 )
...
* Qdels all queries, adds sleep handling
* DB Core messages admins about undeleted queries
* Compile fixes. Adds missing set waitfor
* Remove world/New shennanigans. Add DBQuery/BlockingExecute()
* Less spammy notifications to admins about undeleted queries
* Increase dbcore fire time to 1 minute
* Upgrade undeleted query warning
* Better place of death
* Fix build
* Remove BlockingExecute, see BSQL PR for why
* Yep, missed that one.
* Psyche, that's the WRONG QUERY!!
2018-06-18 22:48:35 +03:00
ShizCalev
3abd2b6d27
Cleans up logging
2018-06-09 15:51:58 -04:00
vuonojenmustaturska
c65a99f130
Move NODROP_1, DROPDEL_1, ABSTRACT_1 and NOBLUDGEON_1 to item_flags where they belong ( #38171 )
...
* (mostly) nodrop
* (mostly) dropdel
* (mostly) abstract
* nobludgeon
* things i missed
* forgot one
* unintended changes
* energy handcuffs
2018-06-01 11:36:31 +02:00
Firecage
79bea7868b
Adds module upgrades for the Janiborg ( #38114 )
...
* Adds upgrades for the Janiborg.
* Does the requested changes.
2018-05-30 18:09:03 -07:00
Iamgoofball
19992668fd
Eat the ice cream ( #38028 )
...
* Eat the ice cream
* Update robot_items.dm
* Update robot_items.dm
2018-05-26 00:23:52 -04:00
ShizCalev
ba1030f803
Makes more messages pronoun sensitive ( #37582 )
...
* Makes more messages pronoun sensitive
* Some cleanup
* more pronouns
* rever
2018-05-03 18:45:55 -04:00
ShizCalev
df8d58bf66
Fixes missing augmentation hands ( #37373 )
2018-04-27 03:41:56 -04:00
Fox McCloud
057aa31cda
Kills off /obj/item/device ( #37297 )
...
* Kills off /obj/item/device
* whoops
* whoops
* Fix
2018-04-23 15:00:23 +02:00
vuonojenmustaturska
ece7de4fb2
Admin borg panel ( #36990 )
...
* borgpanel
* wip borg upgrades
* some more
* lockdown
* Update borgopanel.ract
* Update borgopanel.ract
* Update borgpanel.dm
* fuggin borg upgrades :DDD
* more compile, less whatever
* meaningless churn
* and we're done
* usr, vtec
* Update borgopanel.ract
* Update borgpanel.dm
* many squid are cool
* reviews
* coerce to client, much nicer this way
* add admin logging
* review stuff
2018-04-08 11:46:27 -04:00
AnturK
5ad59da350
Prefixes apply_effect flags, fixes unconcious define conflict
2018-03-31 16:31:11 +02:00
Ian Turk
fbe5f4a062
Replaced body zone magic strings with defines
2018-03-19 15:44:51 -05:00
vuonojenmustaturska
9f99c0faaa
borgmods
2018-02-18 09:04:11 -06:00
Dax Dupont
4c767ce101
Fixes extremely thicc robots ( #35722 )
...
* Fixes extremely fat robots
* grasp
2018-02-17 18:12:08 +02:00
Dax Dupont
eca04302ec
Expand Cyborg ( #34958 )
...
* Expand Cyborg
* i ded pls nerf
* Oh sheet
2018-01-29 18:30:58 -05:00
vuonojenmustaturska
6406896df1
Replaces a bunch of obj vars (and emagged on machinery/items) with obj_flags ( #34078 )
...
* It works, but is it worth it?
* bitfield helpers take 1
* Would this work?
* remove dangling debug code
* rebase & fixes
* vv bitfield stuff, reading
* DNM oceans of shitcode DNM
* honk
* honk2
* plonk
* rebase & fix
2018-01-22 20:19:46 +01:00
ShizCalev
6179f74fb7
Fixes borg cell recharging runtime
2018-01-19 02:18:40 -05:00
ShizCalev
c4496dbd72
Consolidates bot assemblies under one parent
2018-01-07 13:43:46 -05:00
kevinz000
6ce550dadf
Clownborgs ( #33590 )
2017-12-22 11:57:02 -05:00
coiax
f339b9f2c7
Lollipop dispensers can push lollipops into people's hands ( #33419 )
...
* Lollipop dispensers can push lollipops into people's hands
🆑 coiax
add: A lollipop dispenser in "dispense lollipops" mode can push the
lollipop straight into the targets hand, rather than getting it dirty on
the floor first.
/🆑
Also tidied up and around the robot_items.dm file.
This is a good idea because then you can give people lollipops as a
cyborg that has the lollipop dispenser module.
* Integers instead of numbers
2017-12-17 17:17:09 -05:00
Emmett Gaines
25080ff2c4
defines math ( #33498 )
2017-12-17 11:02:11 -05:00
vuonojenmustaturska
5233ec1f6a
Finishes the forceMove port ( #33519 )
...
* a thing
* thingy 2: electric boogaloo
* Obligatory webeditor commit
2017-12-15 10:39:34 +13:00
Emmett Gaines
7c69cdcb8a
Revert math ( #33059 )
...
* Revert "all this wrapping and it's not even christmas (#33035 )"
This reverts commit faaf15158045d7acea2f2817a1737b
2017-11-23 20:59:52 -05:00
ninjanomnom
2817a1737b
defines math
2017-11-22 17:36:58 -05:00
kevinz000
caa1e1f400
Massive research refactor; changes research system to techwebs; Decentralized research
2017-11-18 19:55:40 -08:00
Jordie
8b19b490d1
JSON feedback ( #32188 )
...
* wip
* wip2
* makes code actually compile on 511 + fixes
* versioning
* s
* adds python conversion script, schema change and removes 'force ' from item_used_for_combat
* fix to compile
* forgot to actually commit this
2017-11-17 02:43:12 -05:00
kevinz000
01a794b190
1# This is a combination of 2 commits. ( #32276 )
...
can no longer turn on projectile dampener with buckled mobs
2017-11-05 05:28:01 -05:00
AnturK
49f35a7147
Nerfs peaceborg chain bucklestun ( #32251 )
...
The definition of a trap option is that you don't know its a trap option until you use it. Obviously anyone who has tried it before realizes that they're a stunted joke but that doesn't make it any worse of a addition to the game.
2017-11-01 11:39:43 +13:00
Jordan Brown
677eefc462
Merge pull request #32211 from YPOQ/borgupgradefix
...
Fixes cyborg upgrades not applying to held items
2017-10-30 15:40:30 -04:00
YPO
097972ef79
Fixes cyborg upgrades not applying to held items
2017-10-28 23:10:03 -06:00
Emmett Gaines
825ab4def4
[512] The great \ref purge ( #31824 )
...
* The great \ref purge
* cleanup
2017-10-28 17:20:04 -04:00
Tad Hardesty
c1794bb402
Fix many instances of "the the"
...
All uses of "the [src]" have been fixed, as well as other bad string
interpolation directly adjacent to such uses.
In addition to its message, the circumstances under which the tracking
implant locator fails have been updated to use the correct define,
malfunctioning on CentCom rather than on the station.
2017-10-11 21:55:44 -07:00
Jordan Brown
b6d349e1d4
Remove drop_item, drop_item_v, put_in_hands_or_del ( #31386 )
2017-10-07 13:36:33 -04:00
Tad Hardesty
5a0bb2f599
Grammar fixes to atom descriptions ( #31293 )
...
* Grammar fixes to atom descriptions
- Capitalization and punctuation on most descriptions
- CentCom instead of centcom where appropriate
- Earth instead of earth where appropriate
* Remove spaces before newlines and oneline some strings
2017-10-05 16:33:35 -04:00
shizcalev
81e5154a70
Various grammar fixes
2017-09-17 01:46:41 -04:00
shizcalev
75dc5d8272
Moved emagged var to item parent.
2017-08-17 22:15:11 -04:00
Ian Turk
7460f2c5b8
Replaced flags with flags_1
2017-08-16 13:01:15 -06:00
Jordan Brown
af4d9a85c9
Repaths /obj/item/weapon to /obj/item ( #29929 )
2017-08-16 10:38:51 -03:00
ShizCalev
45d3d52af7
Made some object lists less terrible to read ( #29304 )
...
* spaces
* more spaces
* last ones
2017-07-18 10:44:29 -04:00
ShizCalev
59ef81245b
Changes some 1s and 0s to TRUE and FALSE ( #29144 )
2017-07-10 10:31:34 -04:00
Jordan Brown
1c8badd8fe
Merge pull request #28590 from optimumtact/korthemoorstrikesthebooritsquiteashorethatbringsustothefore
...
Refactors hitreaction to pass in the hitting atom
2017-06-20 09:21:14 -04:00
oranges
186d17b77b
Refactors hitreaction to pass in the hitting atom
...
Required some upstream changes to the check_shields proc to also
reliably pass in the atom
2017-06-20 02:48:17 +00:00
Joan Lung
2672d88800
Renames stun effects and changes stun input values as preliminary work for changing stuns to status effects ( #28524 )
2017-06-18 23:03:51 -03:00
Lzimann
42aa0dd3aa
Changes all the typecaches to the obj definition
2017-06-17 13:24:40 -03:00
Lzimann
3b7fc1afc2
Changes a lot of is_type_in_list to use a typecache
2017-06-13 15:56:09 -03:00
kevinz000
968a384605
Fixes dead PKborgs having active dampener fields ( #28214 )
...
* Create robot_items.dm
* on mob death
2017-06-13 09:23:18 +02:00
Lzimann
3e34eb9e3f
Changes all sounds to be lower case, plus standardizes their references
2017-06-11 00:38:45 -03:00
