Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Chinsky
8e5f5ef8e0
Merge pull request #9165 from Yoshax/trapping
...
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
PsiOmega
c2200109d0
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
Github is ok, I guess
229087c269
Update statistics.dm
2015-05-17 10:36:20 +01:00
Zuhayr
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
PsiOmega
f9306431b7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2015-05-14 22:20:58 +02:00
I HATE GITHUB SO MUCH!
a7d0047b27
Fixes a problem with sql population logging where players and admins are placed on different rows
...
Replaces two procs:
proc/sql_poll_admins()
proc/sql_poll_players()
With the proc:
proc/sql_poll_population()
Which does the same thing, except fixes and issue with sql logging, where player counts and admin counts would be placed in different rows:
Pictures for comparison:
Before: https://i.imgur.com/As4hAV8.png
After: http://i.imgur.com/ssm20IQ.png
2015-05-13 20:46:36 +01:00
Chinsky
ad67215b08
Merge pull request #9073 from PsiOmegaDelta/QDels
...
Implementing Destroy():s
2015-05-12 18:26:57 +03:00
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
Yoshax
9bdfeb5ab1
Adds if statement
2015-05-11 13:16:07 +01:00
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Yoshax
cb8a4c7d75
Removes redundant proc call
2015-05-10 22:03:10 +01:00
Yoshax
5ff5214528
Removes redundant var
2015-05-10 20:51:36 +01:00
Yoshax
b0d10a6508
Fixes some stuff (+2 squashed commit)
...
Squashed commit:
[f63e170] Removes unnecessary /
[ac1b52c] re adds 1 bear trap i somehow accidently removed
2015-05-10 20:43:36 +01:00
Yoshax
86bf94ba07
Refactors bear traps
2015-05-10 20:09:29 +01:00
Yoshax
6c121d232b
Makes bear traps do damage when stepped on
2015-05-09 19:57:01 +01:00
GinjaNinja32
75b5cf0b1e
Acting jobs now sort with non-acting jobs on the manifest.
2015-05-09 15:36:04 +01:00
PsiOmega
6f9da12276
Implementing Destroy():s
...
First out: APCs, security camera consoles, vents.
2015-05-03 10:45:35 +02:00
Zuhayr
dbf8e53020
Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores.
2015-04-26 12:53:26 +09:30
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmega
eca7569077
Clean server start.
...
Server start messages concerning initialization, object generation, etc. is now only propagated to users with R_DEBUG access.
2015-04-18 15:32:25 +02:00
PsiOmega
f3be9b41f0
Ports /vg/'s Nas-Sie remake.
...
First phase: Port cultify procs.
2015-04-11 13:58:08 +02:00
PsiOmega
990530d118
Ports /vg/'s spell system for the sake of cult porting.
...
Does offer a much more pleasant basis to work with in the future, if someone wishes to add more spell-like abilities.
2015-04-09 20:08:06 +02:00
PsiOmega
71a8ddf50e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/modules/paperwork/paper.dm
code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
PsiOmega
66c56926d0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/cult/runes.dm
2015-04-08 10:40:38 +02:00
PsiOmega
036a948372
Rune logging.
...
Adds various rune logging.
2015-04-06 09:44:56 +02:00
volas
2622d2dbfc
sanitize() refactor: fourth pass
2015-04-03 00:40:57 +03:00
Zuhayr
84302ca204
Chinsky fix ur shit
2015-04-01 08:21:44 -07:00
PsiOmega
e1f8af1997
Cleans up announcement sound handling. Plays communication blackout sound at half volume.
2015-03-31 14:51:22 +02:00
PsiOmega
c4a10f05b1
Allows admins to more easily set security levels.
...
Also alters the sound for code delta.
2015-03-31 14:32:28 +02:00
Chinsky
eb390ffde3
Fixes #8246
2015-03-30 23:20:09 +03:00
PsiOmega
710abd0921
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/spells/mind_transfer.dm
2015-03-29 16:23:06 +02:00
PsiOmegaDelta
84e4f6315f
Merge pull request #8660 from Baystation12/master
...
Dev-freeze
2015-03-29 16:19:38 +02:00
PsiOmega
633db48082
Wizard mind transfer attack log.
...
Adds an attack log for the wizard mind transfer.
2015-03-27 09:08:09 +01:00
volas
f8822626bb
sanitize() refactor: second pass(other sanitize functions)
2015-03-23 01:38:09 +03:00
Zuhayr
3895349787
Merge pull request #8374 from Baystation12/dev-freeze
...
Dev freeze into dev
2015-03-07 12:05:32 +10:30
Zuhayr
1984ef6e51
Master into dev-freeze.
2015-03-07 11:33:39 +10:30
PsiOmega
0262ab0de0
Runtime fixes
...
Fixes
````
runtime error: Cannot read null.name
proc name: sql report cyborg death (/proc/sql_report_cyborg_death)
source file: statistics.dm,87
usr: the maintenance drone (106) (/mob/living/silicon/robot/drone)
src: null
````
````
runtime error: Cannot read null.name
proc name: sql report death (/proc/sql_report_death)
source file: statistics.dm,52
usr: null
src: null
````
````
runtime error: Cannot read null.armor
proc name: infection check (/proc/infection_check)
source file: helpers.dm,16
usr: null
src: null
````
````
runtime error: bad client
proc name: open (/datum/nanoui/proc/open)
source file: nanoui.dm,419
usr: null
src: /datum/nanoui (/datum/nanoui)
/datum/nanoui (/datum/nanoui): open()
````
````
runtime error: undefined variable /obj/effect/plantsegment/var/movable
proc name: update canmove (/mob/proc/update_canmove)
source file: mob.dm,862
usr: null
src: the monkey (643) (/mob/living/carbon/monkey)
````
2015-03-06 18:39:44 +01:00
mwerezak
3bf5a5ca99
Updates storage costs
...
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
2015-03-05 10:40:25 -05:00
PsiOmega
98be5cbce8
Synth medical sensors now report dead/alive status.
...
Synths with medical augmentation sensors enabled will now see the dead/alive status of crew members with suit sensors set to at least binary level.
2015-03-02 13:04:02 +01:00
PsiOmega
b3b7ed06cd
Fixes #8234
...
Updates a few missed containers to use proper paths.
2015-02-24 14:06:23 +01:00
Zuhayr
9c45f000ec
Merge with dev.
2015-02-16 20:34:07 +10:30
Chinsky
f9ba327c3a
Merge pull request #8099 from mwerezak/gun-rewrite
...
Gun rewrite
2015-02-16 11:54:52 +03:00
Chinsky
541bcd757e
Merge pull request #8141 from Baystation12/master
...
master -> dev
2015-02-16 11:53:14 +03:00
PsiOmega
a48545391a
Fixes out of memory runtime errors and excessive HTML parsing.
...
Announcements are no longer parsed twice, avoiding messages such as "T's nice".
Fixes the strip_html_properly proc, to avoid out of memory runtimes.
2015-02-15 18:03:25 +01:00
mwerezak
f8977c65af
Much nicer syringe gun implementation
...
Makes syringe guns a type of launcher gun, and removes the hack
projectile.
Also moves syringe and dart gun source files into the modules/projectile
folder.
2015-02-13 23:48:35 -05:00
Zuhayr
5e87b21d44
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenohydro
2015-02-14 09:32:17 +10:30
PsiOmega
d4ae710c0c
Tweaks and corrections.
2015-02-12 21:11:38 +01:00
